Refactoring.
Add parameters to Surround constructor