Revamp CAA