switch added and hooked up