Updating from 1.6 to 1.7/ Part 1