Repalced with a PushProducer based implementation #9