need to do this conversion for all modes, not just stream