Added CPM calculations