refactored a lot of streams and added missing @Overrides