added more modifications