made some changes doe