changes for CPR queries