SAP and EPC improvement