fb: more work

Change-Id: I93fed2287d20de72050fcb98a684dfc51734f55b