Issue #126 remove usage of upstream and downstream