Changed some options around