add comments for upstream