CLN: Moved some things around