Upstream set up