Do some modifications