Added proper control for RC switches