more progress for hit logic
Merge origin/master
more progress for hit logic