The right way to rebuild CPMC