modified the hit class to use the new geometry classes