made more modifications