Switched order of some stuff.