Added check for upstream