Switchers Update and some refactoring