First pass for 1.8 update