Incorporated improvements from CIPC Phase 2.