Improved Performance (Deleted unnecessary draw methods)