added retrospective entry and state transition
merged conflicts