A few more modifications