Fix TFP logic and simplify the FBO model. i.e. it's not necessary