diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d005b93..8b16f2f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Change Log
 
 ## [Unreleased]
+### Changed
+- Notify child components in update not in render (#42)
+  - No updates on props change (breaking change in an undocumented behavior)
 
 ## [1.2.0] - 2020-02-29
 ### Changed
diff --git a/README.md b/README.md
index fab51b18..cfd39ba1 100644
--- a/README.md
+++ b/README.md
@@ -164,8 +164,6 @@ You can also try them in codesandbox.io:
 
 ## Benchmarks
 
-<img alt="benchmark result" src="https://user-images.githubusercontent.com/490574/62705335-28f34300-ba28-11e9-84ea-8f785c445ff4.png" width="600" />
-
 See [this](https://github.com/dai-shi/react-tracked/issues/1#issuecomment-519509857) for details.
 
 ## Blogs
diff --git a/__tests__/e2e/__snapshots__/01_minimal.js.snap b/__tests__/e2e/__snapshots__/01_minimal.js.snap
index 6d48014e..eeb2a92c 100644
--- a/__tests__/e2e/__snapshots__/01_minimal.js.snap
+++ b/__tests__/e2e/__snapshots__/01_minimal.js.snap
@@ -10,7 +10,7 @@ exports[`01_minimal should work with recorded events 1`] = `
 
 exports[`01_minimal should work with recorded events 2`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 14<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 16<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -18,7 +18,7 @@ exports[`01_minimal should work with recorded events 2`] = `
 
 exports[`01_minimal should work with recorded events 3`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 3</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 3</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 26<div><span>Count: 3</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 28<div><span>Count: 3</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -26,7 +26,7 @@ exports[`01_minimal should work with recorded events 3`] = `
 
 exports[`01_minimal should work with recorded events 4`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 24<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -34,7 +34,7 @@ exports[`01_minimal should work with recorded events 4`] = `
 
 exports[`01_minimal should work with recorded events 5`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 26<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 28<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 42<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 44<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -42,7 +42,7 @@ exports[`01_minimal should work with recorded events 5`] = `
 
 exports[`01_minimal should work with recorded events 6`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 30<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 32<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 50<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 52<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -50,7 +50,7 @@ exports[`01_minimal should work with recorded events 6`] = `
 
 exports[`01_minimal should work with recorded events 7`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 58<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 60<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -58,7 +58,7 @@ exports[`01_minimal should work with recorded events 7`] = `
 
 exports[`01_minimal should work with recorded events 8`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 38<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 40<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 66<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 68<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -66,7 +66,7 @@ exports[`01_minimal should work with recorded events 8`] = `
 
 exports[`01_minimal should work with recorded events 9`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 42<div><span>Count: -3</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 44<div><span>Count: -3</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 74<div><span>Count: -3</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 76<div><span>Count: -3</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -74,7 +74,7 @@ exports[`01_minimal should work with recorded events 9`] = `
 
 exports[`01_minimal should work with recorded events 10`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 46<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 48<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 82<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 84<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -82,7 +82,7 @@ exports[`01_minimal should work with recorded events 10`] = `
 
 exports[`01_minimal should work with recorded events 11`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 50<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 52<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 90<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 92<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -90,7 +90,7 @@ exports[`01_minimal should work with recorded events 11`] = `
 
 exports[`01_minimal should work with recorded events 12`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 54<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 56<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 98<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 100<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -98,7 +98,7 @@ exports[`01_minimal should work with recorded events 12`] = `
 
 exports[`01_minimal should work with recorded events 13`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 54<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 56<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 98<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 100<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -106,7 +106,7 @@ exports[`01_minimal should work with recorded events 13`] = `
 
 exports[`01_minimal should work with recorded events 14`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 54<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 56<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 58<div><span>Text: hello1</span><input value=\\"hello1\\"></div></div><div>numRendered: 60<div><span>Text: hello1</span><input value=\\"hello1\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 98<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 100<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 110<div><span>Text: hello1</span><input value=\\"hello1\\"></div></div><div>numRendered: 112<div><span>Text: hello1</span><input value=\\"hello1\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -114,7 +114,7 @@ exports[`01_minimal should work with recorded events 14`] = `
 
 exports[`01_minimal should work with recorded events 15`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 54<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 56<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 62<div><span>Text: hello12</span><input value=\\"hello12\\"></div></div><div>numRendered: 64<div><span>Text: hello12</span><input value=\\"hello12\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 98<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 100<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 118<div><span>Text: hello12</span><input value=\\"hello12\\"></div></div><div>numRendered: 120<div><span>Text: hello12</span><input value=\\"hello12\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -122,7 +122,7 @@ exports[`01_minimal should work with recorded events 15`] = `
 
 exports[`01_minimal should work with recorded events 16`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 54<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 56<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 66<div><span>Text: hello123</span><input value=\\"hello123\\"></div></div><div>numRendered: 68<div><span>Text: hello123</span><input value=\\"hello123\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 98<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 100<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 126<div><span>Text: hello123</span><input value=\\"hello123\\"></div></div><div>numRendered: 128<div><span>Text: hello123</span><input value=\\"hello123\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
diff --git a/__tests__/e2e/__snapshots__/02_typescript.js.snap b/__tests__/e2e/__snapshots__/02_typescript.js.snap
index 3022a1c9..53736ef5 100644
--- a/__tests__/e2e/__snapshots__/02_typescript.js.snap
+++ b/__tests__/e2e/__snapshots__/02_typescript.js.snap
@@ -2,7 +2,7 @@
 
 exports[`02_typescript should work with recorded events 1`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 6<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 10<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 12<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 6<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 12<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 16<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -10,7 +10,7 @@ exports[`02_typescript should work with recorded events 1`] = `
 
 exports[`02_typescript should work with recorded events 2`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 10<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 12<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 14<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 16<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 10<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 12<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 20<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 24<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -18,7 +18,7 @@ exports[`02_typescript should work with recorded events 2`] = `
 
 exports[`02_typescript should work with recorded events 3`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 14<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 16<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 18<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 20<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 14<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 16<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 28<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 32<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -26,7 +26,7 @@ exports[`02_typescript should work with recorded events 3`] = `
 
 exports[`02_typescript should work with recorded events 4`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 22<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 24<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 40<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -34,7 +34,7 @@ exports[`02_typescript should work with recorded events 4`] = `
 
 exports[`02_typescript should work with recorded events 5`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 24<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 26<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 28<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 24<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 44<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 48<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -42,7 +42,7 @@ exports[`02_typescript should work with recorded events 5`] = `
 
 exports[`02_typescript should work with recorded events 6`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 26<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 28<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 30<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 32<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 26<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 28<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 52<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 56<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -50,7 +50,7 @@ exports[`02_typescript should work with recorded events 6`] = `
 
 exports[`02_typescript should work with recorded events 7`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 30<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 32<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 34<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 36<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 30<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 32<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 60<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 64<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -58,7 +58,7 @@ exports[`02_typescript should work with recorded events 7`] = `
 
 exports[`02_typescript should work with recorded events 8`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 38<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 40<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 68<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 72<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -66,7 +66,7 @@ exports[`02_typescript should work with recorded events 8`] = `
 
 exports[`02_typescript should work with recorded events 9`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 38<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 40<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 68<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 72<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -74,7 +74,7 @@ exports[`02_typescript should work with recorded events 9`] = `
 
 exports[`02_typescript should work with recorded events 10`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 42<div>numRendered: 44a<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 46<div>numRendered: 48a<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 74<div>numRendered: 76a<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 78<div>numRendered: 80a<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -82,7 +82,7 @@ exports[`02_typescript should work with recorded events 10`] = `
 
 exports[`02_typescript should work with recorded events 11`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 50<div>numRendered: 52ab<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"ab\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 54<div>numRendered: 56ab<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"ab\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 82<div>numRendered: 84ab<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"ab\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 86<div>numRendered: 88ab<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"ab\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -90,7 +90,7 @@ exports[`02_typescript should work with recorded events 11`] = `
 
 exports[`02_typescript should work with recorded events 12`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 58<div>numRendered: 60abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 62<div>numRendered: 64abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 90<div>numRendered: 92abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 94<div>numRendered: 96abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -98,7 +98,7 @@ exports[`02_typescript should work with recorded events 12`] = `
 
 exports[`02_typescript should work with recorded events 13`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 66<div>numRendered: 68abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"d\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 70<div>numRendered: 72abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"d\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 98<div>numRendered: 100abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"d\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 102<div>numRendered: 104abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"d\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -106,7 +106,7 @@ exports[`02_typescript should work with recorded events 13`] = `
 
 exports[`02_typescript should work with recorded events 14`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 74<div>numRendered: 76abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"de\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 78<div>numRendered: 80abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"de\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 106<div>numRendered: 108abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"de\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 110<div>numRendered: 112abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"de\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -114,7 +114,7 @@ exports[`02_typescript should work with recorded events 14`] = `
 
 exports[`02_typescript should work with recorded events 15`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 82<div>numRendered: 84abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 86<div>numRendered: 88abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 114<div>numRendered: 116abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 118<div>numRendered: 120abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -122,7 +122,7 @@ exports[`02_typescript should work with recorded events 15`] = `
 
 exports[`02_typescript should work with recorded events 16`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 90<div>numRendered: 92abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"1\\"></div></div><div>numRendered: 94<div>numRendered: 96abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"1\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 122<div>numRendered: 124abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"1\\"></div></div><div>numRendered: 126<div>numRendered: 128abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"1\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -130,7 +130,7 @@ exports[`02_typescript should work with recorded events 16`] = `
 
 exports[`02_typescript should work with recorded events 17`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 98<div>numRendered: 100abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"12\\"></div></div><div>numRendered: 102<div>numRendered: 104abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"12\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 130<div>numRendered: 132abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"12\\"></div></div><div>numRendered: 134<div>numRendered: 136abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"12\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -138,7 +138,7 @@ exports[`02_typescript should work with recorded events 17`] = `
 
 exports[`02_typescript should work with recorded events 18`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 106<div>numRendered: 108abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"123\\"></div></div><div>numRendered: 110<div>numRendered: 112abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"123\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 138<div>numRendered: 140abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"123\\"></div></div><div>numRendered: 142<div>numRendered: 144abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"123\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
diff --git a/__tests__/e2e/__snapshots__/03_usestate.js.snap b/__tests__/e2e/__snapshots__/03_usestate.js.snap
index 0a2a54d5..056213bc 100644
--- a/__tests__/e2e/__snapshots__/03_usestate.js.snap
+++ b/__tests__/e2e/__snapshots__/03_usestate.js.snap
@@ -50,7 +50,7 @@ exports[`03_usestate should work with recorded events 6`] = `
 
 exports[`03_usestate should work with recorded events 7`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 6<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 8<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 26<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 28<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -58,7 +58,7 @@ exports[`03_usestate should work with recorded events 7`] = `
 
 exports[`03_usestate should work with recorded events 8`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 10<div>First Name:<input value=\\"aa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 12<div>First Name:<input value=\\"aa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 30<div>First Name:<input value=\\"aa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 32<div>First Name:<input value=\\"aa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -66,7 +66,7 @@ exports[`03_usestate should work with recorded events 8`] = `
 
 exports[`03_usestate should work with recorded events 9`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 14<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 16<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 34<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 36<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -74,7 +74,7 @@ exports[`03_usestate should work with recorded events 9`] = `
 
 exports[`03_usestate should work with recorded events 10`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 18<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"b\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 20<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"b\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 38<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"b\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 40<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"b\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -82,7 +82,7 @@ exports[`03_usestate should work with recorded events 10`] = `
 
 exports[`03_usestate should work with recorded events 11`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 22<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bb\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 24<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bb\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 42<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bb\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 44<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bb\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -90,7 +90,7 @@ exports[`03_usestate should work with recorded events 11`] = `
 
 exports[`03_usestate should work with recorded events 12`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 26<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 28<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 46<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 48<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -98,7 +98,7 @@ exports[`03_usestate should work with recorded events 12`] = `
 
 exports[`03_usestate should work with recorded events 13`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 30<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"1\\"></div></div><div>numRendered: 32<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"1\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 50<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"1\\"></div></div><div>numRendered: 52<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"1\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -106,7 +106,7 @@ exports[`03_usestate should work with recorded events 13`] = `
 
 exports[`03_usestate should work with recorded events 14`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 34<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"11\\"></div></div><div>numRendered: 36<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"11\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 54<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"11\\"></div></div><div>numRendered: 56<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"11\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -114,7 +114,7 @@ exports[`03_usestate should work with recorded events 14`] = `
 
 exports[`03_usestate should work with recorded events 15`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 38<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"111\\"></div></div><div>numRendered: 40<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"111\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 58<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"111\\"></div></div><div>numRendered: 60<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"111\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
diff --git a/__tests__/e2e/__snapshots__/04_selector.js.snap b/__tests__/e2e/__snapshots__/04_selector.js.snap
index 3aad0434..a0b42287 100644
--- a/__tests__/e2e/__snapshots__/04_selector.js.snap
+++ b/__tests__/e2e/__snapshots__/04_selector.js.snap
@@ -42,7 +42,7 @@ exports[`04_selector should work with recorded events 5`] = `
 
 exports[`04_selector should work with recorded events 6`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 6<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 8<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 22<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 24<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -50,7 +50,7 @@ exports[`04_selector should work with recorded events 6`] = `
 
 exports[`04_selector should work with recorded events 7`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 10<div>First Name:<input value=\\"aa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 12<div>First Name:<input value=\\"aa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 26<div>First Name:<input value=\\"aa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 28<div>First Name:<input value=\\"aa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -58,7 +58,7 @@ exports[`04_selector should work with recorded events 7`] = `
 
 exports[`04_selector should work with recorded events 8`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 14<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 16<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 30<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 32<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -66,7 +66,7 @@ exports[`04_selector should work with recorded events 8`] = `
 
 exports[`04_selector should work with recorded events 9`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 18<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"b\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 20<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"b\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 34<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"b\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 36<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"b\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -74,7 +74,7 @@ exports[`04_selector should work with recorded events 9`] = `
 
 exports[`04_selector should work with recorded events 10`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 22<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bb\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 24<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bb\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 38<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bb\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 40<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bb\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -82,7 +82,7 @@ exports[`04_selector should work with recorded events 10`] = `
 
 exports[`04_selector should work with recorded events 11`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 26<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 28<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 42<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 44<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -90,7 +90,7 @@ exports[`04_selector should work with recorded events 11`] = `
 
 exports[`04_selector should work with recorded events 12`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 30<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"1\\"></div></div><div>numRendered: 32<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"1\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 46<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"1\\"></div></div><div>numRendered: 48<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"1\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -98,7 +98,7 @@ exports[`04_selector should work with recorded events 12`] = `
 
 exports[`04_selector should work with recorded events 13`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 34<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"11\\"></div></div><div>numRendered: 36<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"11\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 50<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"11\\"></div></div><div>numRendered: 52<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"11\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -106,7 +106,7 @@ exports[`04_selector should work with recorded events 13`] = `
 
 exports[`04_selector should work with recorded events 14`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 38<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"111\\"></div></div><div>numRendered: 40<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"111\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 54<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"111\\"></div></div><div>numRendered: 56<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"111\\"></div></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
diff --git a/__tests__/e2e/__snapshots__/06_customhook.js.snap b/__tests__/e2e/__snapshots__/06_customhook.js.snap
index 0b92f694..64149e04 100644
--- a/__tests__/e2e/__snapshots__/06_customhook.js.snap
+++ b/__tests__/e2e/__snapshots__/06_customhook.js.snap
@@ -2,7 +2,7 @@
 
 exports[`06_customhook should work with recorded events 1`] = `
 "
-    <div id=\\"app\\"><div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div><div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div>
+    <div id=\\"app\\"><div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div><div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -10,7 +10,7 @@ exports[`06_customhook should work with recorded events 1`] = `
 
 exports[`06_customhook should work with recorded events 2`] = `
 "
-    <div id=\\"app\\"><div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div><div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div>
+    <div id=\\"app\\"><div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div><div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -18,7 +18,7 @@ exports[`06_customhook should work with recorded events 2`] = `
 
 exports[`06_customhook should work with recorded events 3`] = `
 "
-    <div id=\\"app\\"><div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div><div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div>
+    <div id=\\"app\\"><div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div><div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -34,7 +34,7 @@ exports[`06_customhook should work with recorded events 4`] = `
 
 exports[`06_customhook should work with recorded events 5`] = `
 "
-    <div id=\\"app\\"><div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div><div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div>
+    <div id=\\"app\\"><div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div><div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -42,7 +42,7 @@ exports[`06_customhook should work with recorded events 5`] = `
 
 exports[`06_customhook should work with recorded events 6`] = `
 "
-    <div id=\\"app\\"><div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div><div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div>
+    <div id=\\"app\\"><div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div><div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -50,7 +50,7 @@ exports[`06_customhook should work with recorded events 6`] = `
 
 exports[`06_customhook should work with recorded events 7`] = `
 "
-    <div id=\\"app\\"><div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div><div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div>
+    <div id=\\"app\\"><div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div><div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
diff --git a/__tests__/e2e/__snapshots__/11_form.js.snap b/__tests__/e2e/__snapshots__/11_form.js.snap
index 62b081dd..a8612406 100644
--- a/__tests__/e2e/__snapshots__/11_form.js.snap
+++ b/__tests__/e2e/__snapshots__/11_form.js.snap
@@ -2,7 +2,7 @@
 
 exports[`11_form should work with recorded events 1`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 12<button type=\\"submit\\" disabled=\\"\\">Submit</button><h3>First Name</h3><div>numRendered: 14<div>First Name:<input value=\\"\\">name is required</div></div><h3>Family Name</h3><div>numRendered: 16<div>Family Name:<input value=\\"\\">name is required</div></div><h3>Gender</h3><div>numRendered: 18<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 20<button type=\\"submit\\" disabled=\\"\\">Submit</button><h3>First Name</h3><div>numRendered: 12<div>First Name:<input value=\\"\\">name is required</div></div><h3>Family Name</h3><div>numRendered: 14<div>Family Name:<input value=\\"\\">name is required</div></div><h3>Gender</h3><div>numRendered: 16<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 18<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -10,7 +10,7 @@ exports[`11_form should work with recorded events 1`] = `
 
 exports[`11_form should work with recorded events 2`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 22<button type=\\"submit\\" disabled=\\"\\">Submit</button><h3>First Name</h3><div>numRendered: 24<div>First Name:<input value=\\"1\\"></div></div><h3>Family Name</h3><div>numRendered: 16<div>Family Name:<input value=\\"\\">name is required</div></div><h3>Gender</h3><div>numRendered: 18<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 22<button type=\\"submit\\" disabled=\\"\\">Submit</button><h3>First Name</h3><div>numRendered: 24<div>First Name:<input value=\\"1\\"></div></div><h3>Family Name</h3><div>numRendered: 14<div>Family Name:<input value=\\"\\">name is required</div></div><h3>Gender</h3><div>numRendered: 16<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 18<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -18,7 +18,7 @@ exports[`11_form should work with recorded events 2`] = `
 
 exports[`11_form should work with recorded events 3`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 26<button type=\\"submit\\" disabled=\\"\\">Submit</button><h3>First Name</h3><div>numRendered: 28<div>First Name:<input value=\\"11\\"></div></div><h3>Family Name</h3><div>numRendered: 16<div>Family Name:<input value=\\"\\">name is required</div></div><h3>Gender</h3><div>numRendered: 18<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 32<button type=\\"submit\\" disabled=\\"\\">Submit</button><h3>First Name</h3><div>numRendered: 34<div>First Name:<input value=\\"11\\"></div></div><h3>Family Name</h3><div>numRendered: 14<div>Family Name:<input value=\\"\\">name is required</div></div><h3>Gender</h3><div>numRendered: 16<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 18<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -26,7 +26,7 @@ exports[`11_form should work with recorded events 3`] = `
 
 exports[`11_form should work with recorded events 4`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 30<button type=\\"submit\\" disabled=\\"\\">Submit</button><h3>First Name</h3><div>numRendered: 32<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 16<div>Family Name:<input value=\\"\\">name is required</div></div><h3>Gender</h3><div>numRendered: 18<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 42<button type=\\"submit\\" disabled=\\"\\">Submit</button><h3>First Name</h3><div>numRendered: 44<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 14<div>Family Name:<input value=\\"\\">name is required</div></div><h3>Gender</h3><div>numRendered: 16<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 18<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -34,7 +34,7 @@ exports[`11_form should work with recorded events 4`] = `
 
 exports[`11_form should work with recorded events 5`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 34<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 32<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 36<div>Family Name:<input value=\\"2\\"></div></div><h3>Gender</h3><div>numRendered: 18<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 52<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 44<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 56<div>Family Name:<input value=\\"2\\"></div></div><h3>Gender</h3><div>numRendered: 16<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 18<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -42,7 +42,7 @@ exports[`11_form should work with recorded events 5`] = `
 
 exports[`11_form should work with recorded events 6`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 38<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 32<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 40<div>Family Name:<input value=\\"22\\"></div></div><h3>Gender</h3><div>numRendered: 18<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 62<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 44<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 66<div>Family Name:<input value=\\"22\\"></div></div><h3>Gender</h3><div>numRendered: 16<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 18<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -50,7 +50,7 @@ exports[`11_form should work with recorded events 6`] = `
 
 exports[`11_form should work with recorded events 7`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 42<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 32<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 44<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 18<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 72<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 44<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 76<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 16<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 18<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -58,7 +58,7 @@ exports[`11_form should work with recorded events 7`] = `
 
 exports[`11_form should work with recorded events 8`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 42<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 32<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 44<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 18<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 72<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 44<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 76<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 16<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 18<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -66,7 +66,7 @@ exports[`11_form should work with recorded events 8`] = `
 
 exports[`11_form should work with recorded events 9`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 46<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 32<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 44<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 48<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 82<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 44<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 76<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 88<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 18<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -74,7 +74,7 @@ exports[`11_form should work with recorded events 9`] = `
 
 exports[`11_form should work with recorded events 10`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 50<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 32<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 44<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 48<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 52<div>Teenager:<input type=\\"checkbox\\" value=\\"true\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 92<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 44<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 76<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 88<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 100<div>Teenager:<input type=\\"checkbox\\" value=\\"true\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
@@ -82,7 +82,7 @@ exports[`11_form should work with recorded events 10`] = `
 
 exports[`11_form should work with recorded events 11`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 50<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 32<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 44<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 48<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 52<div>Teenager:<input type=\\"checkbox\\" value=\\"true\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 92<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 44<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 76<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 88<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 100<div>Teenager:<input type=\\"checkbox\\" value=\\"true\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script type=\\"text/javascript\\" src=\\"main.js\\"></script>
 
 "
diff --git a/dist/createProvider.js b/dist/createProvider.js
index f136490c..e5075f38 100644
--- a/dist/createProvider.js
+++ b/dist/createProvider.js
@@ -3,12 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createProvider = exports.createCustomContext = exports.SUBSCRIBE_CONTEXT_PROPERTY = exports.UPDATE_CONTEXT_PROPERTY = exports.STATE_CONTEXT_PROPERTY = void 0;
+exports.createProvider = exports.createCustomContext = exports.SUBSCRIBE_CONTEXT_PROPERTY = exports.UPDATE_CONTEXT_PROPERTY = exports.VERSION_CONTEXT_PROPERTY = exports.STATE_CONTEXT_PROPERTY = void 0;
 
 var _react = require("react");
 
-var _utils = require("./utils");
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
@@ -24,6 +22,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 // -------------------------------------------------------
 var STATE_CONTEXT_PROPERTY = 's';
 exports.STATE_CONTEXT_PROPERTY = STATE_CONTEXT_PROPERTY;
+var VERSION_CONTEXT_PROPERTY = 'v';
+exports.VERSION_CONTEXT_PROPERTY = VERSION_CONTEXT_PROPERTY;
 var UPDATE_CONTEXT_PROPERTY = 'u';
 exports.UPDATE_CONTEXT_PROPERTY = UPDATE_CONTEXT_PROPERTY;
 var SUBSCRIBE_CONTEXT_PROPERTY = 'b';
@@ -68,29 +68,28 @@ var createProvider = function createProvider(context, useValue) {
         state = _useValue2[0],
         update = _useValue2[1];
 
-    var listeners = (0, _react.useRef)([]);
+    var _useState = (0, _react.useState)(0),
+        _useState2 = _slicedToArray(_useState, 2),
+        version = _useState2[0],
+        setVersion = _useState2[1];
 
-    if (process.env.NODE_ENV !== 'production') {
-      // we use layout effect to eliminate warnings.
-      // but, this leads tearing with startTransition.
-      // https://github.com/dai-shi/use-context-selector/pull/13
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      (0, _utils.useIsomorphicLayoutEffect)(function () {
-        listeners.current.forEach(function (listener) {
-          return listener(state);
-        });
+    var versionRef = (0, _react.useRef)(0);
+    var listeners = (0, _react.useRef)([]);
+    var updateAndNotify = (0, _react.useCallback)(function () {
+      versionRef.current += 1;
+      listeners.current.forEach(function (listener) {
+        return listener(versionRef.current);
       });
-    } else {
-      // we call listeners in render for optimization.
-      // although this is not a recommended pattern,
-      // so far this is only the way to make it as expected.
-      // we are looking for better solutions.
-      // https://github.com/dai-shi/use-context-selector/pull/12
+      setVersion(versionRef.current);
+      return update.apply(void 0, arguments);
+    }, [update]);
+    (0, _react.useEffect)(function () {
+      versionRef.current += 1;
       listeners.current.forEach(function (listener) {
-        return listener(state);
+        return listener(versionRef.current, state);
       });
-    }
-
+      setVersion(versionRef.current);
+    }, [state]);
     var subscribe = (0, _react.useCallback)(function (listener) {
       listeners.current.push(listener);
 
@@ -102,7 +101,7 @@ var createProvider = function createProvider(context, useValue) {
       return unsubscribe;
     }, []);
     return (0, _react.createElement)(context.Provider, {
-      value: (_value = {}, _defineProperty(_value, STATE_CONTEXT_PROPERTY, state), _defineProperty(_value, UPDATE_CONTEXT_PROPERTY, update), _defineProperty(_value, SUBSCRIBE_CONTEXT_PROPERTY, subscribe), _value)
+      value: (_value = {}, _defineProperty(_value, STATE_CONTEXT_PROPERTY, state), _defineProperty(_value, VERSION_CONTEXT_PROPERTY, version), _defineProperty(_value, UPDATE_CONTEXT_PROPERTY, updateAndNotify), _defineProperty(_value, SUBSCRIBE_CONTEXT_PROPERTY, subscribe), _value)
     }, props.children);
   };
 
diff --git a/dist/createUseSelector.js b/dist/createUseSelector.js
index b1e93565..e68999f2 100644
--- a/dist/createUseSelector.js
+++ b/dist/createUseSelector.js
@@ -11,8 +11,6 @@ var _utils = require("./utils");
 
 var _createProvider = require("./createProvider");
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
@@ -21,6 +19,8 @@ function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) ||
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 var EQUALITY_FN_PROPERTY = 'e';
 var SELECTOR_PROPERTY = 'r';
 var STATE_PROPERTY = 's';
@@ -34,14 +34,9 @@ var createUseSelector = function createUseSelector(context) {
   var useSelector = function useSelector(selector) {
     var equalityFn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultEqualityFn;
 
-    var _useReducer = (0, _react.useReducer)(function (c) {
-      return c + 1;
-    }, 0),
-        _useReducer2 = _slicedToArray(_useReducer, 2),
-        forceUpdate = _useReducer2[1];
-
     var _useContext = (0, _react.useContext)(context),
         state = _useContext[_createProvider.STATE_CONTEXT_PROPERTY],
+        version = _useContext[_createProvider.VERSION_CONTEXT_PROPERTY],
         subscribe = _useContext[_createProvider.SUBSCRIBE_CONTEXT_PROPERTY];
 
     var selected = selector(state);
@@ -51,19 +46,40 @@ var createUseSelector = function createUseSelector(context) {
 
       ref.current = (_ref$current = {}, _defineProperty(_ref$current, EQUALITY_FN_PROPERTY, equalityFn), _defineProperty(_ref$current, SELECTOR_PROPERTY, selector), _defineProperty(_ref$current, STATE_PROPERTY, state), _defineProperty(_ref$current, SELECTED_PROPERTY, selected), _ref$current);
     });
+
+    var _useReducer = (0, _react.useReducer)(function (c, v) {
+      if (version < v) {
+        return c + 1; // schedule update
+      }
+
+      try {
+        var refCurrent = ref.current;
+
+        if (refCurrent[STATE_PROPERTY] === state || refCurrent[EQUALITY_FN_PROPERTY](refCurrent[SELECTED_PROPERTY], refCurrent[SELECTOR_PROPERTY](state))) {
+          // not changed
+          return c; // bail out
+        }
+      } catch (e) {// ignored (stale props or some other reason)
+      }
+
+      return c + 1;
+    }, 0),
+        _useReducer2 = _slicedToArray(_useReducer, 2),
+        checkUpdate = _useReducer2[1];
+
     (0, _utils.useIsomorphicLayoutEffect)(function () {
-      var callback = function callback(nextState) {
+      var callback = function callback(nextVersion, nextState) {
         try {
           var refCurrent = ref.current;
 
-          if (refCurrent[STATE_PROPERTY] === nextState || refCurrent[EQUALITY_FN_PROPERTY](refCurrent[SELECTED_PROPERTY], refCurrent[SELECTOR_PROPERTY](nextState))) {
+          if (nextState && (refCurrent[STATE_PROPERTY] === nextState || refCurrent[EQUALITY_FN_PROPERTY](refCurrent[SELECTED_PROPERTY], refCurrent[SELECTOR_PROPERTY](nextState)))) {
             // not changed
             return;
           }
         } catch (e) {// ignored (stale props or some other reason)
         }
 
-        forceUpdate();
+        checkUpdate(nextVersion);
       };
 
       var unsubscribe = subscribe(callback);
diff --git a/dist/createUseTrackedState.js b/dist/createUseTrackedState.js
index 8268d30c..a3b31986 100644
--- a/dist/createUseTrackedState.js
+++ b/dist/createUseTrackedState.js
@@ -15,8 +15,6 @@ var _deepProxy = require("./deepProxy");
 
 var _createUseUpdate = require("./createUseUpdate");
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
@@ -25,6 +23,8 @@ function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) ||
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 var MODE_ALWAYS_ASSUME_CHANGED_IF_UNAFFECTED = 0;
 var MODE_ALWAYS_ASSUME_UNCHANGED_IF_UNAFFECTED = _deepProxy.MODE_ASSUME_UNCHANGED_IF_UNAFFECTED | _deepProxy.MODE_ASSUME_UNCHANGED_IF_UNAFFECTED_IN_DEEP;
 var MODE_MUTABLE_ROOT_STATE = _deepProxy.MODE_IGNORE_REF_EQUALITY; // only for root
@@ -40,14 +40,9 @@ var createUseTrackedState = function createUseTrackedState(context) {
   var useTrackedState = function useTrackedState() {
     var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
-    var _useReducer = (0, _react.useReducer)(function (c) {
-      return c + 1;
-    }, 0),
-        _useReducer2 = _slicedToArray(_useReducer, 2),
-        forceUpdate = _useReducer2[1];
-
     var _useContext = (0, _react.useContext)(context),
         state = _useContext[_createProvider.STATE_CONTEXT_PROPERTY],
+        version = _useContext[_createProvider.VERSION_CONTEXT_PROPERTY],
         subscribe = _useContext[_createProvider.SUBSCRIBE_CONTEXT_PROPERTY];
 
     var affected = new WeakMap();
@@ -59,19 +54,40 @@ var createUseTrackedState = function createUseTrackedState(context) {
       /* default */
       MODE_DEFAULT), _lastTracked$current);
     });
+
+    var _useReducer = (0, _react.useReducer)(function (c, v) {
+      if (version < v) {
+        return c + 1; // schedule update
+      }
+
+      try {
+        var lastTrackedCurrent = lastTracked.current;
+
+        if (lastTrackedCurrent[STATE_PROPERTY] === state || !(0, _deepProxy.isDeepChanged)(lastTrackedCurrent[STATE_PROPERTY], state, lastTrackedCurrent[AFFECTED_PROPERTY], lastTrackedCurrent[CACHE_PROPERTY], lastTrackedCurrent[DEEP_PROXY_MODE_PROPERTY])) {
+          // not changed
+          return c; // bail out
+        }
+      } catch (e) {// ignored (thrown promise or some other reason)
+      }
+
+      return c + 1;
+    }, 0),
+        _useReducer2 = _slicedToArray(_useReducer, 2),
+        checkUpdate = _useReducer2[1];
+
     (0, _utils.useIsomorphicLayoutEffect)(function () {
-      var callback = function callback(nextState) {
+      var callback = function callback(nextVersion, nextState) {
         try {
           var lastTrackedCurrent = lastTracked.current;
 
-          if (lastTrackedCurrent[STATE_PROPERTY] === nextState || !(0, _deepProxy.isDeepChanged)(lastTrackedCurrent[STATE_PROPERTY], nextState, lastTrackedCurrent[AFFECTED_PROPERTY], lastTrackedCurrent[CACHE_PROPERTY], lastTrackedCurrent[DEEP_PROXY_MODE_PROPERTY])) {
+          if (nextState && (lastTrackedCurrent[STATE_PROPERTY] === nextState || !(0, _deepProxy.isDeepChanged)(lastTrackedCurrent[STATE_PROPERTY], nextState, lastTrackedCurrent[AFFECTED_PROPERTY], lastTrackedCurrent[CACHE_PROPERTY], lastTrackedCurrent[DEEP_PROXY_MODE_PROPERTY]))) {
             // not changed
             return;
           }
         } catch (e) {// ignored (thrown promise or some other reason)
         }
 
-        forceUpdate();
+        checkUpdate(nextVersion);
       };
 
       var unsubscribe = subscribe(callback);
diff --git a/src/createProvider.js b/src/createProvider.js
index 2762e831..7d680be4 100644
--- a/src/createProvider.js
+++ b/src/createProvider.js
@@ -2,16 +2,17 @@ import {
   createContext,
   createElement,
   useCallback,
+  useEffect,
   useRef,
+  useState,
 } from 'react';
 
-import { useIsomorphicLayoutEffect } from './utils';
-
 // -------------------------------------------------------
 // context
 // -------------------------------------------------------
 
 export const STATE_CONTEXT_PROPERTY = 's';
+export const VERSION_CONTEXT_PROPERTY = 'v';
 export const UPDATE_CONTEXT_PROPERTY = 'u';
 export const SUBSCRIBE_CONTEXT_PROPERTY = 'b';
 
@@ -44,23 +45,20 @@ export const createCustomContext = (
 export const createProvider = (context, useValue) => {
   const Provider = (props) => {
     const [state, update] = useValue(props);
+    const [version, setVersion] = useState(0);
+    const versionRef = useRef(0);
     const listeners = useRef([]);
-    if (process.env.NODE_ENV !== 'production') {
-      // we use layout effect to eliminate warnings.
-      // but, this leads tearing with startTransition.
-      // https://github.com/dai-shi/use-context-selector/pull/13
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      useIsomorphicLayoutEffect(() => {
-        listeners.current.forEach((listener) => listener(state));
-      });
-    } else {
-      // we call listeners in render for optimization.
-      // although this is not a recommended pattern,
-      // so far this is only the way to make it as expected.
-      // we are looking for better solutions.
-      // https://github.com/dai-shi/use-context-selector/pull/12
-      listeners.current.forEach((listener) => listener(state));
-    }
+    const updateAndNotify = useCallback((...args) => {
+      versionRef.current += 1;
+      listeners.current.forEach((listener) => listener(versionRef.current));
+      setVersion(versionRef.current);
+      return update(...args);
+    }, [update]);
+    useEffect(() => {
+      versionRef.current += 1;
+      listeners.current.forEach((listener) => listener(versionRef.current, state));
+      setVersion(versionRef.current);
+    }, [state]);
     const subscribe = useCallback((listener) => {
       listeners.current.push(listener);
       const unsubscribe = () => {
@@ -74,7 +72,8 @@ export const createProvider = (context, useValue) => {
       {
         value: {
           [STATE_CONTEXT_PROPERTY]: state,
-          [UPDATE_CONTEXT_PROPERTY]: update,
+          [VERSION_CONTEXT_PROPERTY]: version,
+          [UPDATE_CONTEXT_PROPERTY]: updateAndNotify,
           [SUBSCRIBE_CONTEXT_PROPERTY]: subscribe,
         },
       },
diff --git a/src/createUseSelector.js b/src/createUseSelector.js
index 788b40f0..f5fba3ec 100644
--- a/src/createUseSelector.js
+++ b/src/createUseSelector.js
@@ -7,6 +7,7 @@ import {
 import { useIsomorphicLayoutEffect } from './utils';
 import {
   STATE_CONTEXT_PROPERTY,
+  VERSION_CONTEXT_PROPERTY,
   SUBSCRIBE_CONTEXT_PROPERTY,
 } from './createProvider';
 
@@ -22,9 +23,9 @@ export const createUseSelector = (context) => {
     selector,
     equalityFn = defaultEqualityFn,
   ) => {
-    const [, forceUpdate] = useReducer((c) => c + 1, 0);
     const {
       [STATE_CONTEXT_PROPERTY]: state,
+      [VERSION_CONTEXT_PROPERTY]: version,
       [SUBSCRIBE_CONTEXT_PROPERTY]: subscribe,
     } = useContext(context);
     const selected = selector(state);
@@ -37,22 +38,41 @@ export const createUseSelector = (context) => {
         [SELECTED_PROPERTY]: selected,
       };
     });
+    const [, checkUpdate] = useReducer((c, v) => {
+      if (version < v) {
+        return c + 1; // schedule update
+      }
+      try {
+        const refCurrent = ref.current;
+        if (refCurrent[STATE_PROPERTY] === state
+          || refCurrent[EQUALITY_FN_PROPERTY](
+            refCurrent[SELECTED_PROPERTY],
+            refCurrent[SELECTOR_PROPERTY](state),
+          )) {
+          // not changed
+          return c; // bail out
+        }
+      } catch (e) {
+        // ignored (stale props or some other reason)
+      }
+      return c + 1;
+    }, 0);
     useIsomorphicLayoutEffect(() => {
-      const callback = (nextState) => {
+      const callback = (nextVersion, nextState) => {
         try {
           const refCurrent = ref.current;
-          if (refCurrent[STATE_PROPERTY] === nextState
+          if (nextState && (refCurrent[STATE_PROPERTY] === nextState
             || refCurrent[EQUALITY_FN_PROPERTY](
               refCurrent[SELECTED_PROPERTY],
               refCurrent[SELECTOR_PROPERTY](nextState),
-            )) {
+            ))) {
             // not changed
             return;
           }
         } catch (e) {
           // ignored (stale props or some other reason)
         }
-        forceUpdate();
+        checkUpdate(nextVersion);
       };
       const unsubscribe = subscribe(callback);
       return unsubscribe;
diff --git a/src/createUseTrackedState.js b/src/createUseTrackedState.js
index b57c791a..fbde6d2d 100644
--- a/src/createUseTrackedState.js
+++ b/src/createUseTrackedState.js
@@ -8,6 +8,7 @@ import {
 import { useIsomorphicLayoutEffect, useAffectedDebugValue } from './utils';
 import {
   STATE_CONTEXT_PROPERTY,
+  VERSION_CONTEXT_PROPERTY,
   SUBSCRIBE_CONTEXT_PROPERTY,
 } from './createProvider';
 import {
@@ -33,9 +34,9 @@ const DEEP_PROXY_MODE_PROPERTY = 'd';
 
 export const createUseTrackedState = (context) => {
   const useTrackedState = (opts = {}) => {
-    const [, forceUpdate] = useReducer((c) => c + 1, 0);
     const {
       [STATE_CONTEXT_PROPERTY]: state,
+      [VERSION_CONTEXT_PROPERTY]: version,
       [SUBSCRIBE_CONTEXT_PROPERTY]: subscribe,
     } = useContext(context);
     const affected = new WeakMap();
@@ -54,25 +55,47 @@ export const createUseTrackedState = (context) => {
         /* eslint-enable no-nested-ternary, indent */
       };
     });
+    const [, checkUpdate] = useReducer((c, v) => {
+      if (version < v) {
+        return c + 1; // schedule update
+      }
+      try {
+        const lastTrackedCurrent = lastTracked.current;
+        if (lastTrackedCurrent[STATE_PROPERTY] === state
+          || !isDeepChanged(
+            lastTrackedCurrent[STATE_PROPERTY],
+            state,
+            lastTrackedCurrent[AFFECTED_PROPERTY],
+            lastTrackedCurrent[CACHE_PROPERTY],
+            lastTrackedCurrent[DEEP_PROXY_MODE_PROPERTY],
+          )) {
+          // not changed
+          return c; // bail out
+        }
+      } catch (e) {
+        // ignored (thrown promise or some other reason)
+      }
+      return c + 1;
+    }, 0);
     useIsomorphicLayoutEffect(() => {
-      const callback = (nextState) => {
+      const callback = (nextVersion, nextState) => {
         try {
           const lastTrackedCurrent = lastTracked.current;
-          if (lastTrackedCurrent[STATE_PROPERTY] === nextState
+          if (nextState && (lastTrackedCurrent[STATE_PROPERTY] === nextState
             || !isDeepChanged(
               lastTrackedCurrent[STATE_PROPERTY],
               nextState,
               lastTrackedCurrent[AFFECTED_PROPERTY],
               lastTrackedCurrent[CACHE_PROPERTY],
               lastTrackedCurrent[DEEP_PROXY_MODE_PROPERTY],
-            )) {
+            ))) {
             // not changed
             return;
           }
         } catch (e) {
           // ignored (thrown promise or some other reason)
         }
-        forceUpdate();
+        checkUpdate(nextVersion);
       };
       const unsubscribe = subscribe(callback);
       return unsubscribe;