move to waf