New waf + switching to boost-light