Rework the response