Added endwise and surround