surround and exchange plugin added