Changed order of some things