First steps to updating to 1.7