More updating to 1.7