Ghost307:
I agree that your suggestion is excellent, and well said.

My opinion of the OPs question, I would lean toward a EGC straight back to the source panel.



John