fix some difference to master, revert streamoase