changes made to the drawing classes. Jesper fails!