Update to 1.6

Update to 1.6