added basic switches