FIXED better iteration in CP