larkup 0.1.28 → 0.1.30

package/components/data/firecrawl-notice.tsx

@@ -1,21 +1,12 @@
-"use client";
+'use client';
 
-import { useState, useEffect } from "react";
-import useSWR from "swr";
-import {
-  CheckCircle2,
-  KeyRound,
-  Loader2,
-  Play,
-  Server,
-  Square,
-  TriangleAlert,
-} from "lucide-react";
-import { toast } from "sonner";
-import { formatErrorMessage } from "@/lib/error-formatter";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
-import { Badge } from "@/components/ui/badge";
+import { useState, useEffect } from 'react';
+import { useRouter } from 'next/navigation';
+import useSWR from 'swr';
+import { Loader2, Play, Square } from 'lucide-react';
+import { toast } from 'sonner';
+import { formatErrorMessage } from '@/lib/error-formatter';
+import { Button } from '@/components/ui/button';
 
 interface LocalState {
   running: boolean;
@@ -33,7 +24,7 @@ interface DockerState {
 interface LocalResponse {
   state: LocalState;
   docker: DockerState;
-  runtimeEnv?: "web" | "desktop" | "docker";
+  runtimeEnv?: 'web' | 'desktop' | 'docker';
 }
 
 const fetcher = (url: string) => fetch(url).then((r) => r.json());
@@ -57,19 +48,15 @@ export function FirecrawlNotice({
   onChange?: () => void;
   onErrorChange?: (hasError: boolean) => void;
 }) {
-  const { data, mutate, isLoading } = useSWR<LocalResponse>(
-    "/api/firecrawl/local",
-    fetcher,
-    {
-      refreshInterval: (d) =>
-        d?.state.running || d?.state.startedAt ? 8000 : 0,
-    },
-  );
-  const [busy, setBusy] = useState<"start" | "stop" | null>(null);
+  const router = useRouter();
+  const { data, mutate, isLoading } = useSWR<LocalResponse>('/api/firecrawl/local', fetcher, {
+    refreshInterval: (d) => (d?.state.running || d?.state.startedAt ? 8000 : 0),
+  });
+  const [busy, setBusy] = useState<'start' | 'stop' | null>(null);
 
   const state = data?.state;
   const docker = data?.docker;
-  const runtimeEnv = data?.runtimeEnv ?? "web";
+  const runtimeEnv = data?.runtimeEnv ?? 'web';
   const running = state?.running ?? false;
   const dockerReady = docker?.compose ?? false;
   const hasError = !cloudConfigured && (!dockerReady || !!state?.lastError);
@@ -80,49 +67,45 @@ export function FirecrawlNotice({
     }
   }, [hasError, isLoading, onErrorChange]);
 
-  async function control(action: "start" | "stop") {
+  async function control(action: 'start' | 'stop') {
     setBusy(action);
-    if (action === "start") {
+    if (action === 'start') {
       toast.info(
-        runtimeEnv === "docker"
-          ? "Connecting to crawler service…"
-          : "Launching web crawler…",
+        runtimeEnv === 'docker' ? 'Connecting to crawler service…' : 'Launching web crawler…',
         {
           description:
-            runtimeEnv === "docker"
-              ? "Checking if the crawler service is available on the network."
-              : "Pulling images and starting containers. This can take a minute on first run.",
+            runtimeEnv === 'docker'
+              ? 'Checking if the crawler service is available on the network.'
+              : 'Pulling images and starting containers. This can take a minute on first run.',
         },
       );
     }
     try {
-      const res = await fetch("/api/firecrawl/local", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
+      const res = await fetch('/api/firecrawl/local', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ action }),
       });
       const json = (await res.json()) as { state?: LocalState; error?: string };
-      if (!res.ok) throw new Error(json.error || "Request failed");
+      if (!res.ok) throw new Error(json.error || 'Request failed');
 
-      if (action === "start") {
+      if (action === 'start') {
         if (json.state?.running) {
-          toast.success("Web crawler is running", {
-            description: "Web scraping is now active.",
+          toast.success('Web crawler is running', {
+            description: 'Web scraping is now active.',
           });
         } else {
-          toast.warning("Crawler started", {
-            description:
-              json.state?.lastError ??
-              "Waiting for the service to become healthy.",
+          toast.warning('Web crawler is starting', {
+            description: 'It may take a moment to become available. Try again shortly.',
           });
         }
       } else {
-        toast.success("Web crawler stopped");
+        toast.success('Web crawler stopped');
       }
       await mutate();
       onChange?.();
     } catch (err) {
-      toast.error("Could not control web crawler", {
+      toast.error('Could not connect to the web crawler', {
         description: formatErrorMessage(err),
       });
     } finally {
@@ -130,31 +113,16 @@ export function FirecrawlNotice({
     }
   }
 
-  // Both cloud and local options are kept available.
-
-  // Description text based on environment
-  const idleDescription = (() => {
-    if (runtimeEnv === "docker") {
-      return dockerReady
-        ? "A crawler service was found on the network. Click to connect."
-        : "Start your deployment with the crawler profile to enable web scraping: docker compose --profile crawler up";
-    }
-    if (cloudConfigured) {
-      return "You have a cloud key set. You can also run the crawler locally via Docker.";
-    }
-    return "Launch a self-hosted web crawler via Docker. A key is generated automatically — no signup required. Pasting and uploading work without it.";
-  })();
-
   return (
     <div className="flex items-center gap-2">
       {running ? (
         <Button
           variant="outline"
           className="h-10 gap-1.5 rounded-md bg-red-500 hover:bg-red-600 text-white hover:text-white hover:border-red-200 text-sm px-4 shadow-none"
-          onClick={() => control("stop")}
+          onClick={() => control('stop')}
           disabled={busy !== null}
         >
-          {busy === "stop" ? (
+          {busy === 'stop' ? (
             <Loader2 className="size-3 animate-spin" />
           ) : (
             <Square className="size-3" />
@@ -164,45 +132,28 @@ export function FirecrawlNotice({
       ) : (
         <Button
           variant="outline"
-          onClick={() => control("start")}
-          disabled={
-            busy !== null ||
-            isLoading ||
-            (!dockerReady && runtimeEnv !== "docker")
-          }
+          onClick={() => {
+            if (runtimeEnv === 'docker' && !dockerReady) {
+              router.push('/settings?section=general#web-crawler');
+              return;
+            }
+            control('start');
+          }}
+          disabled={busy !== null || isLoading}
           className="h-10 gap-1.5 rounded-md text-sm px-4 shadow-none bg-orange-500 text-white hover:bg-orange-600 hover:text-white"
         >
-          {busy === "start" ? (
+          {busy === 'start' ? (
             <Loader2 className="size-3 animate-spin text-muted-foreground" />
           ) : (
-            <img
-              src="/icons/firecrawl2.png"
-              alt=""
-              className="size-3 object-contain"
-            />
+            <img src="/icons/firecrawl2.png" alt="" className="size-3 object-contain" />
           )}
-          {runtimeEnv === "docker" ? "Connect Crawler" : "Launch Crawler"}
+          {runtimeEnv === 'docker' && !dockerReady
+            ? 'Crawler settings'
+            : runtimeEnv === 'docker'
+            ? 'Connect Crawler'
+            : 'Launch Crawler'}
         </Button>
       )}
-
-      {state?.lastError && !running && (
-        <span
-          className="text-[10px] text-destructive flex items-center gap-1 max-w-[200px] truncate"
-          title={state.lastError}
-        >
-          <TriangleAlert className="size-3 shrink-0" />
-          <span className="truncate">Error starting crawler</span>
-        </span>
-      )}
-      {!isLoading && !dockerReady && !running && docker?.message && (
-        <span
-          className="text-[10px] text-destructive flex items-center gap-1 max-w-[200px] truncate"
-          title={docker.message}
-        >
-          <TriangleAlert className="size-3 shrink-0" />
-          <span className="truncate">Docker issue</span>
-        </span>
-      )}
     </div>
   );
 }

package/components/data/media-panel.tsx

@@ -304,6 +304,12 @@ export function MediaPanel({
   const videoAudioTool = toolsData?.tools?.find((t: any) => t.id === 'video-audio');
   const isToolInstalled = videoAudioTool?.status === 'installed';
   const enabledTools = configData?.config?.enabledTools;
+  const videoAudioConfig = configData?.config?.toolConfigs?.['video-audio'] ?? {};
+  const audioProvider =
+    typeof videoAudioConfig.audioProvider === 'string' ? videoAudioConfig.audioProvider : '';
+  const audioApiKey =
+    typeof videoAudioConfig.audioApiKey === 'string' ? videoAudioConfig.audioApiKey : '';
+  const audioConfigured = Boolean(audioProvider && (audioProvider === 'local' || audioApiKey));
   const isToolEnabled = enabledTools
     ? enabledTools.length === 0 || enabledTools.includes('video-audio')
     : true;
@@ -391,6 +397,8 @@ export function MediaPanel({
             mutate();
             onAdded();
           }}
+          audioConfigured={audioConfigured}
+          onConfigureAudio={() => router.push('/settings?section=tool-settings')}
         />
       )}
     </div>
@@ -428,7 +436,13 @@ function InstallPrompt({
         const err = await res.json();
         throw new Error(err.error || 'Install failed');
       }
-      toast.success('Tool installed successfully');
+      toast.success('Video & Audio installed', {
+        description: 'Choose an audio provider before indexing video or audio.',
+        action: {
+          label: 'Set up audio',
+          onClick: () => window.location.assign('/settings?section=tool-settings'),
+        },
+      });
       onInstallComplete();
     } catch (err) {
       toast.error(err instanceof Error ? err.message : 'Failed to install tool');
@@ -509,6 +523,8 @@ function MediaContent({
   serverId,
   onMutate,
   onUploadComplete,
+  audioConfigured,
+  onConfigureAudio,
 }: {
   mediaType: 'image' | 'video' | 'audio';
   tab: MediaSubTab;
@@ -518,6 +534,8 @@ function MediaContent({
   serverId?: string;
   onMutate: () => void | Promise<unknown>;
   onUploadComplete: () => void;
+  audioConfigured: boolean;
+  onConfigureAudio: () => void;
 }) {
   const inputRef = useRef<HTMLInputElement>(null);
   const router = useRouter();
@@ -587,7 +605,8 @@ function MediaContent({
     if (
       msg.toLowerCase().includes('api key') ||
       msg.toLowerCase().includes('configuration') ||
-      msg.toLowerCase().includes('missing provider')
+      msg.toLowerCase().includes('missing provider') ||
+      msg.toLowerCase().includes('choose an audio provider')
     ) {
       toast.error(msg, {
         duration: 10000,
@@ -601,6 +620,16 @@ function MediaContent({
     }
   }
 
+  function ensureAudioConfiguration(): boolean {
+    if (mediaType === 'image' || audioConfigured) return true;
+    toast.error('Set up an audio provider to index video or audio.', {
+      description: 'Select a provider and add its API key in Installed Tools.',
+      duration: 10_000,
+      action: { label: 'Set up audio', onClick: onConfigureAudio },
+    });
+    return false;
+  }
+
   async function processAssets(assetIds: string[]) {
     const PROCESS_BATCH_SIZE = 4;
     for (let i = 0; i < assetIds.length; i += PROCESS_BATCH_SIZE) {
@@ -635,6 +664,7 @@ function MediaContent({
   async function reviewRemoteEstimate() {
     const urls = parsedUrls();
     if (urls.length === 0) return;
+    if (!ensureAudioConfiguration()) return;
     setCheckingUrls(true);
     try {
       const res = await fetch(mediaApiUrl, {
@@ -655,6 +685,7 @@ function MediaContent({
   async function importRemoteUrls() {
     const urls = parsedUrls();
     if (urls.length === 0 || !remoteEstimates) return;
+    if (!ensureAudioConfiguration()) return;
     setImportingUrls(true);
     try {
       const res = await fetch(mediaApiUrl, {
@@ -681,6 +712,7 @@ function MediaContent({
 
   async function uploadAll() {
     if (staged.length === 0) return;
+    if (!ensureAudioConfiguration()) return;
     setUploading(true);
 
     const BATCH_SIZE = 5;
@@ -1602,9 +1634,6 @@ function ActiveIndexingList({
                   {asset.processingMessage || 'Preparing media indexing...'}
                 </p>
               </div>
-              {asset.processingSteps?.length ? (
-                <PipelineSteps steps={asset.processingSteps} />
-              ) : null}
             </div>
           );
         })}

package/components/data/scrape-panel.tsx

@@ -36,6 +36,7 @@ import { GenericAlert } from '@/components/alerts/generic-alert';
 import { cn } from '@/lib/utils';
 import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs';
 import useSWR from 'swr';
+import { useRouter } from 'next/navigation';
 import type { RagConfig } from '@larkup/core/types';
 
 const fetcher = (url: string) => fetch(url).then((r) => r.json() as Promise<{ config: RagConfig }>);
@@ -85,6 +86,7 @@ export function ScrapePanel({
   onStarted: () => void;
   crawlerControl?: React.ReactNode;
 }) {
+  const router = useRouter();
   const {
     query,
     setQuery,
@@ -124,6 +126,15 @@ export function ScrapePanel({
   const inputRef = useRef<HTMLInputElement>(null);
   const dropdownRef = useRef<HTMLDivElement>(null);
 
+  function showCrawlerSettings() {
+    toast.error('Web crawler is not available. Choose a crawler provider in Settings.', {
+      action: {
+        label: 'Open settings',
+        onClick: () => router.push('/settings?section=general#web-crawler'),
+      },
+    });
+  }
+
   useEffect(() => {
     function handleClickOutside(event: MouseEvent) {
       if (
@@ -222,7 +233,12 @@ export function ScrapePanel({
         fetchProviderTotalCount(q, activeProvider);
       }
     } catch (err) {
-      toast.error(formatErrorMessage(err));
+      const message = formatErrorMessage(err);
+      if (/crawler|firecrawl|not running|api key/i.test(message)) {
+        showCrawlerSettings();
+      } else {
+        toast.error(message);
+      }
     }
   }
 

package/components/data/upload-panel.tsx

@@ -314,7 +314,7 @@ export function UploadPanel({ onAdded }: { onAdded: () => void }) {
 
                   const res = await fetch(img.base64);
                   const blob = await res.blob();
-                  const file = new File([blob], `image-${img.index}.png`, { type: 'image/png' });
+                  const file = new File([blob], `image-${img.index}.jpg`, { type: 'image/jpeg' });
 
                   const formData = new FormData();
                   formData.append('file', file);
@@ -386,6 +386,7 @@ export function UploadPanel({ onAdded }: { onAdded: () => void }) {
                       imageUrl: img.imageUrl,
                       pageNumber: img.pageNumber,
                       index: img.index,
+                      description: img.description,
                     })),
                   }
                 : undefined,

package/components/onboarding/welcome-screen.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useState } from 'react';
-import { ArrowRight, Loader2, ChevronDown, ChevronUp, Pencil } from 'lucide-react';
+import { ArrowRight, Loader2, ChevronDown, ChevronUp, Pencil, Eye, EyeOff } from 'lucide-react';
 import { Input } from '@/components/ui/input';
 import { Button } from '@/components/ui/button';
 import { useWorkspace } from '@/components/workspace/workspace-provider';
@@ -42,6 +42,8 @@ export function WelcomeScreen() {
   // UI state
   const [saving, setSaving] = useState(false);
   const [showSeparateChat, setShowSeparateChat] = useState(false);
+  const [showEmbeddingApiKey, setShowEmbeddingApiKey] = useState(false);
+  const [showChatApiKey, setShowChatApiKey] = useState(false);
   const [customModalOpen, setCustomModalOpen] = useState<'embedding' | 'chat' | null>(null);
 
   const isCustomEmbedding = embeddingProvider === 'custom';
@@ -326,13 +328,27 @@ export function WelcomeScreen() {
                     </span>
                   )}
                 </label>
-                <Input
-                  type="password"
-                  value={embeddingApiKey}
-                  onChange={(e) => setEmbeddingApiKey(e.target.value)}
-                  placeholder="sk-..."
-                  className="bg-background/50"
-                />
+                <div className="relative">
+                  <Input
+                    type={showEmbeddingApiKey ? 'text' : 'password'}
+                    value={embeddingApiKey}
+                    onChange={(e) => setEmbeddingApiKey(e.target.value)}
+                    placeholder="sk-..."
+                    className="bg-background/50 pr-10"
+                  />
+                  <button
+                    type="button"
+                    aria-label={showEmbeddingApiKey ? 'Hide API key' : 'Show API key'}
+                    onClick={() => setShowEmbeddingApiKey((visible) => !visible)}
+                    className="absolute inset-y-0 right-0 flex items-center px-3 text-muted-foreground hover:text-foreground"
+                  >
+                    {showEmbeddingApiKey ? (
+                      <EyeOff className="size-4" />
+                    ) : (
+                      <Eye className="size-4" />
+                    )}
+                  </button>
+                </div>
               </div>
             )}
 
@@ -368,13 +384,27 @@ export function WelcomeScreen() {
                 {!isCustomChat && (
                   <div className="space-y-1.5">
                     <label className="text-xs font-medium text-foreground">Chat API Key</label>
-                    <Input
-                      type="password"
-                      value={chatApiKey}
-                      onChange={(e) => setChatApiKey(e.target.value)}
-                      placeholder="sk-..."
-                      className="bg-background/50"
-                    />
+                    <div className="relative">
+                      <Input
+                        type={showChatApiKey ? 'text' : 'password'}
+                        value={chatApiKey}
+                        onChange={(e) => setChatApiKey(e.target.value)}
+                        placeholder="sk-..."
+                        className="bg-background/50 pr-10"
+                      />
+                      <button
+                        type="button"
+                        aria-label={showChatApiKey ? 'Hide chat API key' : 'Show chat API key'}
+                        onClick={() => setShowChatApiKey((visible) => !visible)}
+                        className="absolute inset-y-0 right-0 flex items-center px-3 text-muted-foreground hover:text-foreground"
+                      >
+                        {showChatApiKey ? (
+                          <EyeOff className="size-4" />
+                        ) : (
+                          <Eye className="size-4" />
+                        )}
+                      </button>
+                    </div>
                   </div>
                 )}
               </div>

package/components/settings/general-section.tsx

@@ -201,7 +201,7 @@ export function GeneralSection() {
       </div>
 
       {/* Username */}
-      <Card className="">
+      <Card id="web-crawler" className="">
         <CardHeader className="pb-3">
           <CardTitle className="text-sm">Your Name</CardTitle>
           <CardDescription className="text-xs">Displayed in the workspace header.</CardDescription>
@@ -427,7 +427,7 @@ export function GeneralSection() {
         <CardHeader className="pb-3">
           <CardTitle className="text-sm">Web Scraper</CardTitle>
           <CardDescription className="text-xs">
-            Select your web crawler provider (Local or Cloud).
+            Choose the web crawler used to search and import websites.
           </CardDescription>
         </CardHeader>
         <CardContent className="space-y-4">
@@ -442,30 +442,35 @@ export function GeneralSection() {
             >
               <SelectTrigger className="w-full">
                 <div className="flex items-center gap-2">
-                  <Image src="/icons/firecrawl.png" alt="Firecrawl" width={16} height={16} />
+                  <Image src="/icons/firecrawl.png" alt="Web crawler" width={16} height={16} />
                   <span>
                     {form.webCrawlerProvider === 'cloud'
-                      ? 'Firecrawl (Cloud)'
-                      : 'Local (Firecrawl)'}
+                      ? 'Cloud web crawler'
+                      : 'Local web crawler'}
                   </span>
                 </div>
               </SelectTrigger>
               <SelectContent>
                 <SelectItem value="local">
                   <div className="flex items-center gap-2">
-                    <Image src="/icons/firecrawl.png" alt="Local Crawler" width={16} height={16} />
-                    <span>Local (Firecrawl)</span>
+                    <Image
+                      src="/icons/firecrawl.png"
+                      alt="Local web crawler"
+                      width={16}
+                      height={16}
+                    />
+                    <span>Local web crawler</span>
                   </div>
                 </SelectItem>
                 <SelectItem value="cloud">
                   <div className="flex items-center gap-2">
                     <Image
                       src="/icons/firecrawl.png"
-                      alt="Firecrawl Cloud"
+                      alt="Cloud web crawler"
                       width={16}
                       height={16}
                     />
-                    <span>Firecrawl (Cloud)</span>
+                    <span>Cloud web crawler</span>
                   </div>
                 </SelectItem>
               </SelectContent>
@@ -475,7 +480,7 @@ export function GeneralSection() {
           {form.webCrawlerProvider === 'cloud' && (
             <div className="space-y-1.5 pt-2">
               <div className="flex items-center justify-between">
-                <Label className="text-xs">Firecrawl API Key (Cloud)</Label>
+                <Label className="text-xs">Web crawler API key</Label>
                 {verifyCrawlerStatus.status === 'success' && (
                   <span className="text-[10px] text-green-500 font-medium">✓ Verified</span>
                 )}

package/components/settings/marketplace-section.tsx

@@ -2,6 +2,7 @@
 
 import { useState, useCallback, useMemo } from 'react';
 import useSWR from 'swr';
+import { useRouter } from 'next/navigation';
 import {
   Download,
   Trash2,
@@ -88,6 +89,7 @@ const fetcher = (url: string) =>
   fetch(url).then((r) => r.json() as Promise<{ tools: MarketplaceTool[] }>);
 
 export function MarketplaceSection() {
+  const router = useRouter();
   const { data, isLoading, mutate } = useSWR('/api/marketplace', fetcher);
   const [installing, setInstalling] = useState<string | null>(null);
   const [searchQuery, setSearchQuery] = useState('');
@@ -104,7 +106,17 @@ export function MarketplaceSection() {
           const err = await res.json();
           throw new Error(err.error || 'Install failed');
         }
-        toast.success('Tool installed successfully');
+        if (toolId === 'video-audio') {
+          toast.success('Video & Audio installed', {
+            description: 'Choose an audio provider before you index media.',
+            action: {
+              label: 'Set up audio',
+              onClick: () => router.push('/settings?section=tool-settings'),
+            },
+          });
+        } else {
+          toast.success('Tool installed successfully');
+        }
         mutate();
       } catch (err) {
         toast.error(err instanceof Error ? err.message : 'Failed to install tool');
@@ -112,7 +124,7 @@ export function MarketplaceSection() {
         setInstalling(null);
       }
     },
-    [mutate],
+    [mutate, router],
   );
 
   const handleUninstall = useCallback(

package/components/settings/server-section.tsx

@@ -758,9 +758,9 @@ export function ServerSection() {
             ))}
           </div>
         ) : (
-          <div className="flex flex-col  border border-border rounded-md items-center px-4 py-6 justify-center gap-2 mt-5">
-            <div className="bg-white p-1 border border-border rounded-md">
-              <ServerIcon className="size-5" />
+          <div className="flex flex-col   rounded-md items-center px-4 py-6 justify-center gap-2 mt-5">
+            <div className="bg-white p-1.5 border border-border rounded-md">
+              <ServerIcon className="size-4.5" />
             </div>
             <p className=" rounded-lg text-sm text-muted-foreground text-center mx-auto">
               No cloud deployments yet. Deploy to a provider above to add one here.

package/lib/error-formatter.ts

@@ -1,12 +1,27 @@
 export function formatErrorMessage(error: unknown): string {
   const message = error instanceof Error ? error.message : String(error);
+  const normalized = message.toLowerCase();
 
-  if (message.includes("Is the docker daemon running?")) {
-    return "Docker is not running. Please make sure the Docker daemon is started.";
+  // Provider SDKs sometimes echo the submitted key or a URL-encoded request
+  // URL in authentication failures. Besides being unreadable, that can expose
+  // credential material in a toast. Keep the actionable part instead.
+  if (
+    normalized.includes('authentication failed') ||
+    normalized.includes('invalid api key') ||
+    normalized.includes('invalid api_key') ||
+    normalized.includes('invalid token') ||
+    normalized.includes('unauthorized') ||
+    normalized.includes('status code 401')
+  ) {
+    return 'Authentication failed. Check the API key for the selected provider.';
   }
 
-  if (message.includes("fetch failed") || message.includes("Failed to fetch")) {
-    return "Network error. Please check your connection and try again.";
+  if (message.includes('Is the docker daemon running?')) {
+    return 'Docker is not running. Please make sure the Docker daemon is started.';
+  }
+
+  if (message.includes('fetch failed') || message.includes('Failed to fetch')) {
+    return 'Network error. Please check your connection and try again.';
   }
 
   // Add more common error mappings here as needed