renamed streamId to token