first_state branch change 2