Changes for CAOKP