improvement of the token storing strategy v2