added commentary and surround