updated drawing routines