Added hit testing