add some modification