final update for the moment