Moved Valve switches to start of stage