Add ability to turn of mode selection