Updated FB impl