Do some modification