update to 1.7 part 3 (almost done!)