Working on fbs on border