fixing fb part 1