Fixing token management?