Update to 1.7+