Improvements to SAO (again)