Changes for AICP-AOKP