Few more modifications