Fib pre-refactor