Switched some things around