A few changes to drawing