get V2 implementation working