quick and dirty update for 3.6.6