More work on drawing.