some changes)