removed toggle switches at Jeremy's reqest/recomandation/demand