some changes in Canvas - Hanieh