Update for CPA2