Added more modifications