Necessary & expensive: Fixing the PWSA

Necessary & expensive: Fixing the PWSA