Improve hunter to not be retarded