some changes after reviewing