Rework the definition