changing Switches to switches to be local to the core package