Re-Submission WAF - Project Document - 24 April 2006 - Part 2