some changes.....