POC-6 review and adjustments