v2 last fixing and merging with v2_temp