Do some tweaking