Drawing update, preparing for 1.4