Fixing backpressure and adding controlled