Changed the order of the methods