hit detection now factors state