TPH/CAF changes