Update for WA4.
Finish WA4.