moved solenoids from switches to solenoids