2nd array and hitFeedback
Merge origin/master