update for 6.1 final