Update to 1.8

Update to 1.8