Rework the status