P CAM04 clean-up YA