rework the structure of each hit