made some changes, including name