Converting from V1.0 to V2.0