Trying to fix same current_state repeating