Revised all drawing functions