Switch control changes