more work on wafr