Import v2.0.1 correctly (almost)