made some more modifications