Update to 1.7

Update to 1.7