completed conversion to V2