Rework the loop state