Add 2V2 mode and bug fix