streamified that last commit, needs cleanup