Changes to SW/ControlSW/index