improve fb integration