C&P changes