removed stream stuff..