Editing Steve's Merge #1

No summing kernels here.