Suggestion for hunter changes in 9.0