diff --git a/Form/withForm.tsx b/Form/withForm.tsx
index f24d043..e9daf1b 100644
--- a/Form/withForm.tsx
+++ b/Form/withForm.tsx
@@ -10,11 +10,15 @@ type FormProps<T> = {
     initialData?: T;
 };
 export type WithFormProps<T, P> = P & FormProps<T>;
-export function withForm<T extends object, P extends FormProps<T>>(WrappedForm: React.ComponentType, method: (client: ApiClient, project: OwnerResponse, props: P) => (body: T) => CancelablePromise<any>, submitText: string) {
+type CleanedFormProps<P> = Omit<P, "refresh" | "afterSubmit" | "initialData">;
+export function withForm<T extends object, P extends FormProps<T>>(WrappedForm: React.ComponentType<CleanedFormProps<P>>, method: (client: ApiClient, project: OwnerResponse, props: P) => (body: T) => CancelablePromise<any>, submitText: string, trMethod?: (initialData: T, props: CleanedFormProps<P>) => T) {
     return function GameFormWrapper({ refresh, afterSubmit, initialData, ...props }: P) {
         const client = useApiClient();
         const company = useOwner();
 
+        if (trMethod)
+            initialData = trMethod(initialData, props);
+
         const fnc = method(client, company, { ...props, initialData } as P);
         console.log(fnc);
 
@@ -26,10 +30,10 @@ export function withForm<T extends object, P extends FormProps<T>>(WrappedForm:
         return (
             <FormikForm
                 data={initialData || {} as T}
-                onSubmit={(values) => {submit(values); afterSubmit && afterSubmit(values)}}
+                onSubmit={(values) => { submit(values); afterSubmit && afterSubmit(values) }}
                 submitText={submitText}
             >
-                <WrappedForm />
+                <WrappedForm {...props} />
             </FormikForm>
         );
     };
diff --git a/macros/useMethod.macro.d.ts b/macros/useMethod.macro.d.ts
index 07793d8..c81c529 100644
--- a/macros/useMethod.macro.d.ts
+++ b/macros/useMethod.macro.d.ts
@@ -1,4 +1,4 @@
-import { CancelablePromise, Error } from "src/services/api";
+import { CancelablePromise, Error } from "@services/api";
 
 export default function useMethod<T, Arg>(method: (...args: Arg) => CancelablePromise<T>,
     onDone?: (data: T, ...args: Arg) => void, 
diff --git a/macros/useQuery.macro.d.ts b/macros/useQuery.macro.d.ts
index ce15b4e..51845fa 100644
--- a/macros/useQuery.macro.d.ts
+++ b/macros/useQuery.macro.d.ts
@@ -1,4 +1,4 @@
-import { CancelablePromise, Error } from "src/services/api";
+import { CancelablePromise, Error } from "@services/api";
 
 //default export is a function
 /*