merge stuff from streamers diff but with much change