Polish a bit further