Counterhit now detected more ways. Might want to merge them eventually