Tested Switches

And some changes made