added new and improved waf