changed fb data structure