some changes .....