Getting the 'upstream' bit correct