Changed it to be more whitty about current state