Added current_state