Changing the order of method calls a little bit