Moved some things around for console and security.