Improve speed + new drawing modes