Added o (rather than s) as surround operator