Final update for real