add upstream stuff