some changes...