CS changes