a few more modifications