Fix the WA

Fix the WA - Discussion & Resolution Drafts