Quick comment of the RCS & SAS logic - need to revert later