Updated hit functionality and grid reference