added few more modifications