some changes.........