make tweaks for streamig