Changing order of some methods