Changed to CPC
Updated based on CPC