First go at v1.1 revision.