Commented upstream.h