Updates by PRO TOBY