changes in comments as there is a change in state management