Changing to FSwitch fully