new changes from v1