Moved some things around