Restructuring the SR/WA