add V2 several changes