done with changes v2