I'm not sure what I attached to the last one, but it wasn't what I
intended to send.  Here it is with the actual code changes.