* better hit tracking