Changed the order of how things are called