some more modifications