Refactoring... new drawing mode.