some changes from me