Updated to Bamboo CPT