Final update for v5.5