fix everything for V2