up/downstream and simplify arguments