upstream & downstream both work now