Added ability to toggle between options