added draw_rectangle / removed draw_circle