more Buzz changes for BFIG