Just moved some options around