Add surround and insert