Moved a couple things