and more fbl changes