few more modifications