update for upcoming R