FB integration improvement