updated with commands and stream