Changed format for the draw class methods