final 1.7 changes