Added back in output buffering as an optional feature.