Building a better CPT.