This solution includes the replacement of the existing gfci at panel with a new gfci. We have installed a new gfci at the panel, completed bonding at the water heater and have installed a whole home surge protector.