SC-25 Make further changes