Added fbid column
Merge with origin