Added surround, changed gundo key