replaced dummy hivents by some more generic ones