added surround extension