More work on SAP