replaced buttons with switches