New implementation of FIB seems to be working now
9 files changed