update for 6.1, nicer opening order