made some changes to get