added multiple switches