Changed the order of some stuff.