shifting around the order of methods to be consistent