changed token storage