support for new fb_api
merged