update for recent changes