some changes...........