Moved a couple of things around