lot of refactoring on fbo