updated waf
added new and improved waf