Added two switches