some changes in resolve