remapped surrounding to use prefix s