diff --git a/README.md b/README.md
index 8eedd3cd..88e87d80 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ English | [한국어](./README.KO.md) | [简体中文](./README.CN.md)
 [![npm](https://img.shields.io/npm/v/state-in-url.svg)](https://www.npmjs.com/package/state-in-url)
 ![Tests](https://github.com/asmyshlyaev177/state-in-url/actions/workflows/tests.yml/badge.svg?branch=master)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/73be54068b7f41b0b74a252579ac09ec)](https://app.codacy.com/gh/asmyshlyaev177/state-in-url/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
+[![Codacy Badge](https://app.codacy.com/project/badge/Coverage/73be54068b7f41b0b74a252579ac09ec)](https://app.codacy.com/gh/asmyshlyaev177/state-in-url/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage)
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](https://github.com/asmyshlyaev177/state-in-url/)
 [![semantic-release: angular](https://img.shields.io/badge/semantic--release-angular-e10079?logo=semantic-release)]([https://github.com/semantic-release/semantic-release](https://github.com/asmyshlyaev177/state-in-url))
 ![npm bundle size (minified + gzip)](https://img.shields.io/bundlephobia/minzip/state-in-url.svg)
@@ -165,7 +166,7 @@ import { userState } from './userState';
 function MyComponent() {
   // can pass `replace` arg, it's control will `setUrl` will use `rounter.push` or `router.replace`, default replace=true
   // can pass `searchParams` from server components
-  const { urlState, setUrl, setState } = useUrlState({ defaultState: userState });
+  const { urlState, setUrl, setState } = useUrlState(userState);
 
   return (
     <div>
@@ -221,7 +222,7 @@ import { form } from './form';
 
 function TagsComponent() {
   // `urlState` will infer from Form type!
-  const { urlState, setUrl } = useUrlState({ defaultState: form });
+  const { urlState, setUrl } = useUrlState(form);
 
   const onChangeTags = React.useCallback(
     (tag: (typeof tags)[number]) => {
@@ -320,7 +321,7 @@ import { useUrlState } from 'state-in-url/next';
 import { form } from './form';
 
 const Form = ({ searchParams }: { searchParams: object }) => {
-  const { urlState, setState, setUrl } = useUrlState({ defaultState: form, searchParams });
+  const { urlState, setState, setUrl } = useUrlState(form, { searchParams });
 }
 ```
 
@@ -426,7 +427,7 @@ import { useUrlState } from 'state-in-url/react-router';
 import { form } from './form';
 
 function TagsComponent() {
-  const { urlState, setUrl, setState } = useUrlState({ defaultState: form });
+  const { urlState, setUrl, setState } = useUrlState(form);
 
   const onChangeTags = React.useCallback(
     (tag: (typeof tags)[number]) => {
@@ -540,7 +541,7 @@ const userState = {
 };
 
 export const useUserState = () => {
-  const { urlState, setUrl } = useUrlState({ defaultState: userState });
+  const { urlState, setUrl } = useUrlState(userState);
 
   return { userState: urlState, setUserState: setUrl };;
 }
diff --git a/package-lock.json b/package-lock.json
index c6e22604..2ca8b036 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "state-in-url",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "state-in-url",
-      "version": "4.0.4",
+      "version": "4.0.5",
       "license": "MIT",
       "workspaces": [
         "packages/urlstate",
@@ -33995,6 +33995,21 @@
       "name": "state-in-url",
       "version": "1.0.0",
       "license": "ISC"
+    },
+    "packages/example-nextjs15/node_modules/@next/swc-win32-ia32-msvc": {
+      "version": "14.2.16",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.16.tgz",
+      "integrity": "sha512-jhPl3nN0oKEshJBNDAo0etGMzv0j3q3VYorTSFqH1o3rwv1MQRdor27u1zhkgsHPNeY1jxcgyx1ZsCkDD1IHgg==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
     }
   }
 }
diff --git a/packages/example-nextjs14/src/app/(tests)/useUrlState/Comp1.tsx b/packages/example-nextjs14/src/app/(tests)/useUrlState/Comp1.tsx
index c1584315..e3525357 100644
--- a/packages/example-nextjs14/src/app/(tests)/useUrlState/Comp1.tsx
+++ b/packages/example-nextjs14/src/app/(tests)/useUrlState/Comp1.tsx
@@ -5,8 +5,7 @@ import { useUrlState } from 'state-in-url/next';
 import { stateShape } from './state';
 
 export const Comp1 = ({ searchParams }: { searchParams?: object }) => {
-  const { state, updateUrl } = useUrlState({
-    defaultState: stateShape,
+  const { urlState, setUrl } = useUrlState(stateShape, {
     searchParams,
     replace: false,
   });
@@ -15,9 +14,9 @@ export const Comp1 = ({ searchParams }: { searchParams?: object }) => {
     <div className="flex gap-2">
       <h2>Per page select</h2>
       <select
-        value={state.perPage}
+        value={urlState.perPage}
         onChange={(ev) =>
-          updateUrl((curr) => ({ ...curr, perPage: +ev.target.value }))
+          setUrl((curr) => ({ ...curr, perPage: +ev.target.value }))
         }
         className=""
         data-testid="select"
diff --git a/packages/example-nextjs14/src/app/Form-for-test.tsx b/packages/example-nextjs14/src/app/Form-for-test.tsx
index c125df4f..bd6d4b15 100644
--- a/packages/example-nextjs14/src/app/Form-for-test.tsx
+++ b/packages/example-nextjs14/src/app/Form-for-test.tsx
@@ -14,12 +14,12 @@ export const Form = ({
   delay?: number;
 }) => {
   const sp = useSearchParams();
-  const { urlState, setState, setUrl } = useUrlState({
-    defaultState: form,
+  const { urlState, setState, setUrl } = useUrlState(form, {
     searchParams,
     replace: sp.get('replace') === 'false' ? false : true,
   });
 
+
   React.useEffect(() => {
     if (urlState?.tags?.length) {
       const dateObj = urlState.tags.find((t) => t?.value?.time);
diff --git a/packages/example-nextjs14/src/app/Form.tsx b/packages/example-nextjs14/src/app/Form.tsx
index 9cb1d780..2de63b64 100644
--- a/packages/example-nextjs14/src/app/Form.tsx
+++ b/packages/example-nextjs14/src/app/Form.tsx
@@ -15,8 +15,7 @@ export const Form = ({
   searchParams?: object;
   ghLink: string
 }) => {
-  const { urlState, setUrl } = useUrlState({
-    defaultState: form,
+  const { urlState, setUrl } = useUrlState(form, {
     searchParams,
   });
 
diff --git a/packages/example-nextjs14/src/app/Status-for-test.tsx b/packages/example-nextjs14/src/app/Status-for-test.tsx
index 62119404..ca121ff2 100644
--- a/packages/example-nextjs14/src/app/Status-for-test.tsx
+++ b/packages/example-nextjs14/src/app/Status-for-test.tsx
@@ -4,7 +4,7 @@ import { form } from 'shared/form';
 import { useUrlState } from 'state-in-url/next';
 
 const Status = ({ className, sp }: { className?: string; sp?: object }) => {
-  const { state } = useUrlState({ defaultState: form, searchParams: sp });
+  const { urlState } = useUrlState(form, { searchParams: sp });
 
   return (
     <div className={className}>
@@ -18,7 +18,7 @@ const Status = ({ className, sp }: { className?: string; sp?: object }) => {
           className="h-[330px] text-sm overflow-y-scrolltext-gray-600 bg-white p-4 rounded-md shadow-inner break-all whitespace-pre-wrap"
           data-testid="parsed"
         >
-          {JSON.stringify(state, null, 2)}
+          {JSON.stringify(urlState, null, 2)}
         </pre>
       </div>
     </div>
diff --git a/packages/example-nextjs14/src/app/Status.tsx b/packages/example-nextjs14/src/app/Status.tsx
index 6601012c..fdf3ebf0 100644
--- a/packages/example-nextjs14/src/app/Status.tsx
+++ b/packages/example-nextjs14/src/app/Status.tsx
@@ -14,8 +14,7 @@ export const Status = ({
   sp?: object;
   ghLink: string;
 }) => {
-  const { state } = useUrlState({
-    defaultState: form,
+  const { urlState } = useUrlState(form, {
     searchParams: sp,
     replace: false,
   });
@@ -34,7 +33,7 @@ export const Status = ({
           break-all whitespace-pre-wrap"
           data-testid="parsed"
         >
-          {JSON.stringify(state, null, 2)}
+          {JSON.stringify(urlState, null, 2)}
         </pre>
       </div>
       <SourceCodeBtn
diff --git a/packages/example-nextjs14/src/app/components/CodeBlockForm.tsx b/packages/example-nextjs14/src/app/components/CodeBlockState.tsx
similarity index 91%
rename from packages/example-nextjs14/src/app/components/CodeBlockForm.tsx
rename to packages/example-nextjs14/src/app/components/CodeBlockState.tsx
index 542d0371..ebab6030 100644
--- a/packages/example-nextjs14/src/app/components/CodeBlockForm.tsx
+++ b/packages/example-nextjs14/src/app/components/CodeBlockState.tsx
@@ -1,6 +1,6 @@
 import { File } from './File';
 
-export const CodeBlockForm = () => {
+export const CodeBlockState = () => {
   return (
       <File
         name="state"
diff --git a/packages/example-nextjs14/src/app/components/CodeBlocksNext.tsx b/packages/example-nextjs14/src/app/components/CodeBlocksNext.tsx
index fa223b89..b305377f 100644
--- a/packages/example-nextjs14/src/app/components/CodeBlocksNext.tsx
+++ b/packages/example-nextjs14/src/app/components/CodeBlocksNext.tsx
@@ -1,5 +1,5 @@
 import { File } from './File';
-import { CodeBlockForm } from './CodeBlockForm';
+import { CodeBlockState } from './CodeBlockState';
 
 export const CodeBlocks = () => {
   return (
@@ -8,7 +8,7 @@ export const CodeBlocks = () => {
       <div className="text-center text-xl mt-2">
         1. Define the state
       </div>
-      <CodeBlockForm />
+      <CodeBlockState />
 
       <div className="text-center text-xl mt-2">
         2. Use it in any components
@@ -23,7 +23,8 @@ import { form } from './form';
 export const ComponentA = () => {
   // \`useHistory\` force to use window.history for navigation,
   // no _rsc requests https://github.com/vercel/next.js/discussions/59167
-  const { urlState, setState, setUrl } = useUrlState({ defaultState: form, useHistory: true });// [!code highlight:1]
+  // see docs for all possible params https://github.com/asmyshlyaev177/state-in-url/tree/master/packages/urlstate/next/useUrlState
+  const { urlState, setState, setUrl } = useUrlState(form, { useHistory: true });// [!code highlight:1]
 
   return <>
     <input
@@ -48,7 +49,7 @@ import { form } from './form';
 
 // "searchParams" used to pass params from Server Components
 export const ComponentB = ({ searchParams }: { searchParams?: object }) => {
-  const { urlState } = useUrlState({ defaultState: form, searchParams });// [!code highlight:1]
+  const { urlState } = useUrlState(form, { searchParams });// [!code highlight:1]
 
 // [!code word:urlState]
   return <div>name: {urlState.name}</div>
diff --git a/packages/example-nextjs14/src/app/components/CodeBlocksRR.tsx b/packages/example-nextjs14/src/app/components/CodeBlocksRR.tsx
index 6a4eb1c4..2c2247d0 100644
--- a/packages/example-nextjs14/src/app/components/CodeBlocksRR.tsx
+++ b/packages/example-nextjs14/src/app/components/CodeBlocksRR.tsx
@@ -1,5 +1,5 @@
 import { File } from './File';
-import { CodeBlockForm } from './CodeBlockForm';
+import { CodeBlockState } from './CodeBlockState';
 
 export const CodeBlocksRR = () => {
   return (
@@ -8,7 +8,7 @@ export const CodeBlocksRR = () => {
       <div className="text-center text-xl mt-2">
         1. Define the state
       </div>
-      <CodeBlockForm />
+      <CodeBlockState />
 
       <div className="text-center text-xl mt-2">
         2. Use it in any components
@@ -19,7 +19,8 @@ export const CodeBlocksRR = () => {
 import { form } from './form';
 
 export const ComponentA = () => {
-  const { urlState, setUrl, setState } = useUrlState({ defaultState: form });// [!code highlight:1]
+  // see docs for all possible params https://github.com/asmyshlyaev177/state-in-url/tree/master/packages/urlstate/react-router/useUrlState
+  const { urlState, setUrl, setState } = useUrlState(form, { replace: true });// [!code highlight:1]
 
   return <>
     <input
@@ -42,7 +43,7 @@ export const ComponentA = () => {
 import { form } from './form';
 
 export const ComponentB = () => {
-  const { urlState } = useUrlState({ defaultState: form });// [!code highlight:1]
+  const { urlState } = useUrlState(form);// [!code highlight:1]
 
 // [!code word:urlState]
   return <div>name: {urlState.name}</div>
diff --git a/packages/example-nextjs15/src/app/(tests)/useUrlState/Comp1.tsx b/packages/example-nextjs15/src/app/(tests)/useUrlState/Comp1.tsx
index f73f8c9f..bb621bc5 100644
--- a/packages/example-nextjs15/src/app/(tests)/useUrlState/Comp1.tsx
+++ b/packages/example-nextjs15/src/app/(tests)/useUrlState/Comp1.tsx
@@ -5,8 +5,7 @@ import { useUrlState } from 'state-in-url/next';
 import { stateShape } from './state';
 
 export const Comp1 = ({ searchParams }: { searchParams?: object }) => {
-  const { state, updateUrl } = useUrlState({
-    defaultState: stateShape,
+  const { urlState, setUrl } = useUrlState(stateShape, {
     searchParams,
     replace: false,
   });
@@ -15,9 +14,9 @@ export const Comp1 = ({ searchParams }: { searchParams?: object }) => {
     <div className="flex gap-2">
       <h2>Per page select</h2>
       <select
-        value={state.perPage}
+        value={urlState.perPage}
         onChange={(ev) =>
-          updateUrl((curr) => ({ ...curr, perPage: +ev.target.value }))
+          setUrl((curr) => ({ ...curr, perPage: +ev.target.value }))
         }
         className="text-black"
         data-testid="select"
diff --git a/packages/example-nextjs15/src/app/Form-for-test.tsx b/packages/example-nextjs15/src/app/Form-for-test.tsx
index e5f71e79..29cbee27 100644
--- a/packages/example-nextjs15/src/app/Form-for-test.tsx
+++ b/packages/example-nextjs15/src/app/Form-for-test.tsx
@@ -13,13 +13,11 @@ export const Form = ({
   searchParams?: object;
 }) => {
   const sp = useSearchParams();
-  const { urlState, setState, setUrl } = useUrlState({
-    defaultState: form,
+  const { urlState, setState, setUrl } = useUrlState(form, {
     searchParams,
     replace: sp.get('replace') === 'false' ? false : true,
   });
 
-
   React.useEffect(() => {
     if (urlState?.tags?.length) {
       const dateObj = urlState.tags.find((t) => t?.value?.time);
diff --git a/packages/example-nextjs15/src/app/Status-for-test.tsx b/packages/example-nextjs15/src/app/Status-for-test.tsx
index 5298b001..18418632 100644
--- a/packages/example-nextjs15/src/app/Status-for-test.tsx
+++ b/packages/example-nextjs15/src/app/Status-for-test.tsx
@@ -4,7 +4,7 @@ import { form } from 'shared/form';
 import { useUrlState } from 'state-in-url/next';
 
 const Status = ({ className, sp }: { className?: string; sp?: object }) => {
-  const { state } = useUrlState({ defaultState: form, searchParams: sp });
+  const { urlState } = useUrlState(form, { searchParams: sp });
 
   return (
     <div className={className}>
@@ -18,7 +18,7 @@ const Status = ({ className, sp }: { className?: string; sp?: object }) => {
           className="h-[330px] text-sm overflow-y-scroll text-gray-600 bg-white p-4 rounded-md shadow-inner break-all whitespace-pre-wrap"
           data-testid="parsed"
         >
-          {JSON.stringify(state, null, 2)}
+          {JSON.stringify(urlState, null, 2)}
         </pre>
       </div>
     </div>
diff --git a/packages/example-react-router6/src/FewComponents/Component.tsx b/packages/example-react-router6/src/FewComponents/Component.tsx
index e2dbe090..c761cf40 100644
--- a/packages/example-react-router6/src/FewComponents/Component.tsx
+++ b/packages/example-react-router6/src/FewComponents/Component.tsx
@@ -5,8 +5,7 @@ import { useUrlState } from "state-in-url/react-router";
 import { stateShape } from "./stateShape";
 
 export const Component = () => {
-  const { urlState, setUrl } = useUrlState({
-    defaultState: stateShape,
+  const { urlState, setUrl } = useUrlState(stateShape, {
     replace: false,
   });
 
diff --git a/packages/example-react-router6/src/Form-for-test.tsx b/packages/example-react-router6/src/Form-for-test.tsx
index 774e1bc8..2cd7c903 100644
--- a/packages/example-react-router6/src/Form-for-test.tsx
+++ b/packages/example-react-router6/src/Form-for-test.tsx
@@ -6,8 +6,7 @@ import { useUrlState } from "state-in-url/react-router";
 
 export const Form = ({ className }: { className?: string }) => {
   const [sp] = useSearchParams();
-  const { urlState, setState, setUrl } = useUrlState({
-    defaultState: form,
+  const { urlState, setState, setUrl } = useUrlState(form, {
     replace: sp.get("replace") === "false" ? false : true,
   });
 
diff --git a/packages/example-react-router6/src/Status-for-test.tsx b/packages/example-react-router6/src/Status-for-test.tsx
index a0ebeb9a..9c6f7f48 100644
--- a/packages/example-react-router6/src/Status-for-test.tsx
+++ b/packages/example-react-router6/src/Status-for-test.tsx
@@ -3,7 +3,7 @@ import { form } from "shared/form";
 import { useUrlState } from "state-in-url/react-router";
 
 const Status = ({ className }: { className?: string }) => {
-  const { state } = useUrlState({ defaultState: form });
+  const { urlState } = useUrlState(form);
 
   return (
     <div className={className}>
@@ -17,7 +17,7 @@ const Status = ({ className }: { className?: string }) => {
           break-all whitespace-pre-wrap"
           data-testid="parsed"
         >
-          {JSON.stringify(state, null, 2)}
+          {JSON.stringify(urlState, null, 2)}
         </pre>
       </div>
     </div>
diff --git a/packages/urlstate/next/useUrlState/useUrlState.ts b/packages/urlstate/next/useUrlState/useUrlState.ts
index 66d7c799..b02e0dfc 100644
--- a/packages/urlstate/next/useUrlState/useUrlState.ts
+++ b/packages/urlstate/next/useUrlState/useUrlState.ts
@@ -12,19 +12,41 @@ import {
   routerHistory,
 } from "../../utils";
 
+/**
+ * @deprecated .
+ * * use format `useUrlState(defaultState, { ...otherParams })`
+ *
+ * .
+ */
+export function useUrlState<T extends JSONCompatible>({
+  defaultState: T,
+  searchParams,
+  replace,
+  scroll,
+  useHistory,
+}: OldParams<T>): {
+  state: T;
+  urlState: T;
+  updateState: (value: Partial<T> | ((currState: T) => T)) => void;
+  setState: (value: Partial<T> | ((currState: T) => T)) => void;
+  updateUrl: (value?: Partial<T> | ((currState: T) => T)) => void;
+  setUrl: (value?: Partial<T> | ((currState: T) => T)) => void;
+};
+
 /**
  * NextJS hook. Returns `urlState`, `setState`, and `setUrl` functions
  *
  * @param {JSONCompatible<T>} [defaultState] Fallback (default) values for state
- * @param {?SearchParams<T>} [searchParams] searchParams from Next server component
- * @param {boolean} [useHistory] use window.history for navigation, no _rsc requests https://github.com/vercel/next.js/discussions/59167
+ * @param {Object} params - Object with other parameters
+ * @param {?SearchParams<T>} params.searchParams searchParams from Next server component
+ * @param {boolean} params.useHistory use window.history for navigation, default true, no _rsc requests https://github.com/vercel/next.js/discussions/59167
  *
  * * Example:
  * ```ts
  * export const form = { name: '', age: 0 };
- * const { urlState, setState, setUrl } = useUrlState({ defaultState: form });
- * // for nextjs seerver components
- * // const { urlState, setState, setUrl } = useUrlState({ defaultState: form, searchParams });
+ * const { urlState, setState, setUrl } = useUrlState(form);
+ * // for nextjs server components
+ * const { urlState, setState, setUrl } = useUrlState(form, { searchParams });
  *
  * setState({ name: 'test' });
  * // by default it's uses router.push with scroll: false
@@ -35,19 +57,41 @@ import {
  *
  *  * Docs {@link https://github.com/asmyshlyaev177/state-in-url/tree/master/packages/urlstate/next/useUrlState#api}
  */
-export function useUrlState<T extends JSONCompatible>({
-  defaultState,
-  searchParams,
-  useHistory,
-  ...opts
-}: {
-  defaultState: T;
-  searchParams?: object;
-  replace?: boolean;
-  scroll?: boolean;
-  useHistory?: boolean;
-}) {
-  const router = (useHistory === undefined ? true : !!useHistory)
+export function useUrlState<T extends JSONCompatible>(
+  defaultState: T,
+  params?: Params,
+): {
+  urlState: T;
+  setState: (value: Partial<T> | ((currState: T) => T)) => void;
+  setUrl: (value?: Partial<T> | ((currState: T) => T)) => void;
+};
+
+export function useUrlState<T extends JSONCompatible>(
+  defaultState: T | OldParams<T>,
+  params?: Params,
+) {
+  const _defaultState = (
+    "defaultState" in defaultState ? defaultState.defaultState : defaultState
+  ) as T;
+  const _searchParams = (
+    "defaultState" in defaultState
+      ? defaultState.searchParams
+      : params?.searchParams
+  ) as object;
+  const _useHistory = (
+    "defaultState" in defaultState
+      ? defaultState.useHistory
+      : params?.useHistory
+  ) as boolean;
+  const _opts =
+    "defaultState" in defaultState
+      ? {
+          scroll: defaultState.scroll as boolean,
+          replace: defaultState.replace as boolean,
+        }
+      : { scroll: params?.scroll, replace: params?.replace };
+
+  const router = (_useHistory === undefined ? true : !!_useHistory)
     ? routerHistory
     : useRouter();
   const {
@@ -55,29 +99,29 @@ export function useUrlState<T extends JSONCompatible>({
     updateState,
     updateUrl: updateUrlBase,
     getState,
-  } = useUrlStateBase(defaultState, router, ({ parse }) =>
+  } = useUrlStateBase(_defaultState, router, ({ parse }) =>
     isSSR()
       ? parseSPObj(
-          filterUnknownParams(defaultState, searchParams),
-          defaultState,
+          filterUnknownParams(_defaultState, _searchParams),
+          _defaultState,
         )
-      : parse(filterUnknownParamsClient(defaultState)),
+      : parse(filterUnknownParamsClient(_defaultState)),
   );
 
-  const updateUrl = React.useCallback(
+  const setUrl = React.useCallback(
     (value?: Parameters<typeof updateUrlBase>[0], options?: Options) =>
-      updateUrlBase(value, { ...defaultOptions, ...opts, ...options }),
-    [updateUrlBase, opts],
+      updateUrlBase(value, { ...defaultOptions, ..._opts, ...options }),
+    [updateUrlBase, _opts],
   );
 
   const sp = useSearchParams();
   React.useEffect(() => {
     updateState(
       filterUnknownParams(
-        defaultState,
+        _defaultState,
         parseSPObj(
           Object.fromEntries([...sp.entries()]),
-          defaultState,
+          _defaultState,
         ) as Partial<T>,
       ),
     );
@@ -109,11 +153,11 @@ export function useUrlState<T extends JSONCompatible>({
      *
      *  * Docs {@link https://github.com/asmyshlyaev177/state-in-url/tree/master/packages/urlstate/next/useUrlState#updateurl}
      */
-    setUrl: updateUrl,
+    setUrl,
     /**
      * @deprecated use `setUrl`
      */
-    updateUrl,
+    updateUrl: setUrl,
     /**
      * State object. Don't mutate directly, use `setState` or `setUrl`
      */
@@ -139,3 +183,18 @@ const defaultOptions = {
   replace: true,
   scroll: false,
 };
+
+interface OldParams<T> {
+  defaultState: T;
+  searchParams?: object;
+  replace?: boolean;
+  scroll?: boolean;
+  useHistory?: boolean;
+}
+
+type Params = {
+  searchParams?: object;
+  replace?: boolean;
+  scroll?: boolean;
+  useHistory?: boolean;
+};
diff --git a/packages/urlstate/react-router/useUrlState/useUrlState.ts b/packages/urlstate/react-router/useUrlState/useUrlState.ts
index 49a07c70..c751971c 100644
--- a/packages/urlstate/react-router/useUrlState/useUrlState.ts
+++ b/packages/urlstate/react-router/useUrlState/useUrlState.ts
@@ -15,16 +15,37 @@ import {
   routerHistory,
 } from "../../utils";
 
+/**
+ * @deprecated .
+ * * use format `useUrlState(defaultState, { ...otherParams })`
+ *
+ * .
+ */
+export function useUrlState<T extends JSONCompatible>({
+  defaultState: T,
+  searchParams,
+  replace,
+  useHistory,
+}: OldParams<T>): {
+  state: T;
+  urlState: T;
+  updateState: (value: Partial<T> | ((currState: T) => T)) => void;
+  setState: (value: Partial<T> | ((currState: T) => T)) => void;
+  updateUrl: (value?: Partial<T> | ((currState: T) => T)) => void;
+  setUrl: (value?: Partial<T> | ((currState: T) => T)) => void;
+};
+
 /**
  * React-router hook. Returns `urlState`, `setState`, and `setUrl` functions
  *
  * @param {JSONCompatible<T>} [defaultState] Fallback (default) values for state
- * @param {NavigateOptions} [NavigateOptions] See type from `react-router-dom`
- * @param {boolean} [useHistory] use window.history for navigation
+ * @param {Object} params - Object with other parameters
+ * @param {NavigateOptions} params.NavigateOptions See type from `react-router-dom`
+ * @param {boolean} params.useHistory use window.history for navigation
  * * Example:
  * ```ts
  * export const form = { name: '', age: 0 };
- * const { urlState, setState, setUrl } = useUrlState({ defaultState: form, replace: false, preventScrollReset: false });
+ * const { urlState, setState, setUrl } = useUrlState(form, { replace: false, preventScrollReset: false });
  *
  * setState({ name: 'test' });
  * setUrl({ name: 'test' }, { replace: true });
@@ -34,37 +55,64 @@ import {
  *
  *  * Docs {@link https://github.com/asmyshlyaev177/state-in-url/tree/master/packages/urlstate/react-router/useUrlState#api}
  */
-export function useUrlState<T extends JSONCompatible>({
-  defaultState,
-  useHistory,
-  ...initOpts
-}: { defaultState: T; useHistory?: boolean } & NavigateOptions) {
+export function useUrlState<T extends JSONCompatible>(
+  defaultState: T,
+  params?: Params,
+): {
+  urlState: T;
+  setState: (value: Partial<T> | ((currState: T) => T)) => void;
+  setUrl: (value?: Partial<T> | ((currState: T) => T)) => void;
+};
+
+export function useUrlState<T extends JSONCompatible>(
+  defaultState: T | OldParams<T>,
+  params?: Params,
+) {
+  const _defaultState = (
+    "defaultState" in defaultState ? defaultState.defaultState : defaultState
+  ) as T;
+  const _useHistory = (
+    "defaultState" in defaultState
+      ? defaultState.useHistory
+      : params?.useHistory
+  ) as boolean;
+  const _opts =
+    "defaultState" in defaultState
+      ? {
+          replace: defaultState.replace as boolean,
+          preventScrollReset: defaultState.preventScrollReset as boolean,
+        }
+      : {
+          replace: params?.replace,
+          preventScrollReset: params?.preventScrollReset as boolean,
+        };
+
   const navigate = useNavigate();
   const router = React.useMemo(
     () =>
-      useHistory
+      _useHistory
         ? routerHistory
         : {
-            replace: (url: string, opts: NavigateOptions) =>
-              navigate(url, { ...defaultOpts, ...initOpts, ...opts }),
-            push: (url: string, opts: NavigateOptions) =>
-              navigate(url, { ...defaultOpts, ...initOpts, ...opts }),
+            replace: (url: string, options: NavigateOptions) =>
+              navigate(url, { ...defaultOpts, ..._opts, ...options }),
+            push: (url: string, options: NavigateOptions) =>
+              navigate(url, { ...defaultOpts, ..._opts, ...options }),
           },
-    [navigate, initOpts],
+    [navigate, _opts],
   );
   const {
     state,
     updateState,
     updateUrl: updateUrlBase,
     getState,
-  } = useUrlStateBase(defaultState, router, ({ parse }) =>
-    parse(filterUnknownParamsClient(defaultState)),
+  } = useUrlStateBase(_defaultState, router, ({ parse }) =>
+    parse(filterUnknownParamsClient(_defaultState)),
   );
 
   const updateUrl = React.useCallback(
     (value?: Parameters<typeof updateUrlBase>[0], options?: NavigateOptions) =>
-      updateUrlBase(value, { ...defaultOpts, ...initOpts, ...options }),
-    [initOpts],
+      updateUrlBase(value, { ...defaultOpts, ..._opts, ...options }),
+    [_opts],
   );
 
   const [sp] = useSearchParams();
@@ -72,13 +120,12 @@ export function useUrlState<T extends JSONCompatible>({
   React.useEffect(() => {
     updateState(
       assignValue(
-        defaultState,
-        state as T,
+        _defaultState,
         filterUnknownParams(
-          defaultState,
+          _defaultState,
           parseSPObj(
             Object.fromEntries([...sp.entries()]),
-            defaultState,
+            _defaultState,
           ) as Partial<T>,
         ),
       ),
@@ -136,3 +183,16 @@ const defaultOpts: NavigateOptions = {
   replace: true,
   preventScrollReset: true,
 };
+
+type OldParams<T> = {
+  defaultState: T;
+  useHistory?: boolean;
+  searchParams?: object;
+  replace?: boolean;
+} & NavigateOptions;
+
+interface Params extends NavigateOptions {
+  useHistory?: boolean;
+  searchParams?: object;
+  replace?: boolean;
+}
diff --git a/packages/urlstate/utils.test.ts b/packages/urlstate/utils.test.ts
index 29048389..8e067e66 100644
--- a/packages/urlstate/utils.test.ts
+++ b/packages/urlstate/utils.test.ts
@@ -103,27 +103,25 @@ describe('assignValue', () => {
   }
 
   it('should assign a value', () => {
-    expect(clone(assignValue(shape, { a1: 2 }, { ...shape, a1: 3 }))).toStrictEqual(clone({
+    expect(clone(assignValue(shape, { ...shape, a1: 3 }))).toStrictEqual(clone({
         ...shape,
         a1: 3,
       }))
   })
 
   it('should return a new instance of object', () => {
-    const curr = structuredClone(shape)
     const newVal = {}
-    const result = assignValue(shape, curr, newVal)
+    const result = assignValue(shape, newVal)
     expect(result === shape).toBeFalsy()
-    expect(result === curr).toBeFalsy()
     expect(result === newVal).toBeFalsy()
   })
 
   it('should override curr value with newValue', () => {
-      expect(clone(assignValue(shape, { a1: 2 }, { a1: 3 }))).toStrictEqual(clone({ ...shape, a1: 3 }))
+      expect(clone(assignValue(shape, { a1: 3 }))).toStrictEqual(clone({ ...shape, a1: 3 }))
   })
 
   it('should use value from shape as default', () => {
-      expect(clone(assignValue(shape, { a1: 2 }, {}))).toStrictEqual(clone({ ...shape, a1: shape.a1 }))
+      expect(clone(assignValue(shape, {}))).toStrictEqual(clone({ ...shape, a1: shape.a1 }))
   })
 })
 
diff --git a/packages/urlstate/utils.ts b/packages/urlstate/utils.ts
index 8698c1b5..e5646202 100644
--- a/packages/urlstate/utils.ts
+++ b/packages/urlstate/utils.ts
@@ -95,12 +95,8 @@ function filterUnknown<T extends object>(
     .map(([key, val]) => [key.replaceAll("+", " "), val]);
 }
 
-export function assignValue<T extends object>(
-  shape: T,
-  curr: Partial<T>,
-  newVal: Partial<T>,
-) {
-  const result: T = Object.assign({}, shape, curr);
+export function assignValue<T extends object>(shape: T, newVal: Partial<T>) {
+  const result: T = Object.assign({}, shape);
 
   Object.entries(shape).forEach(([key]) => {
     const _key = key as keyof T;