Update surround to version 2.0