Another attempt with v1.1