add switch and toggle