add changes for V2