Update to 1.1-8.0