Remove surround map and Add manual surrounding method