summary changes, template issue, clean up
post merge summary change