Changed the order
changed the order of the methods