System switching fixed and tested