Do some changes