changed order of drawing