some changes....