Large tweaks to the hug counter