overhaul of drawing mechanism