made some changes to