Moved a few things