Updates by Pinovo