rework the info