re-organized and added surround