some changes in code