Reworked the WG Change detector