More chnages to use estream. Add a way to replace the standard