some changes v2