moved around order of drawing objects