improve memory usage and rename firehose