Update to match other requirements for S+C