Changed 3 classes and Service [Streams not working]