updated to use the new 'sid' semantics (instead of 'stream' or 'pin')