added current_state to index