Reorganized the order of the methods