Another shot at v1 -> v1.1