reviewed some changes