significantly changed Client CPT functionality