update for 1.8 first pass