Updated Attach and Surround methods