update for new upstream version