CLP Remapping And Diagnostics