update for upstream changes