switch to waf complete