Improve surround.