Refactored FBO