added some more modifications