Moved a couple of things