Add pi function and CCP estimates