Now includes additional switches