Update to 1.8