first pass at 1.8 update