Final v1 ok merge 2 diff versions