Tweaking the drawing code