Updated hit testing