Build 4: improved WAD code