Improvment on Canvas