diff --git a/assets/img/guides/references/cy-method-failed-element-is-detached.png b/assets/img/guides/references/cy-method-failed-element-is-detached.png
deleted file mode 100644
index 955d85023a..0000000000
Binary files a/assets/img/guides/references/cy-method-failed-element-is-detached.png and /dev/null differ
diff --git a/assets/img/guides/references/cypress-method-failed-page-updated.png b/assets/img/guides/references/cypress-method-failed-page-updated.png
new file mode 100644
index 0000000000..3cc7e6bdfb
Binary files /dev/null and b/assets/img/guides/references/cypress-method-failed-page-updated.png differ
diff --git a/assets/img/guides/retry-ability/v10/click-twice.gif b/assets/img/guides/retry-ability/click-twice.gif
similarity index 100%
rename from assets/img/guides/retry-ability/v10/click-twice.gif
rename to assets/img/guides/retry-ability/click-twice.gif
diff --git a/assets/img/guides/retry-ability/command-assertions.png b/assets/img/guides/retry-ability/command-assertions.png
new file mode 100644
index 0000000000..e9b001fc59
Binary files /dev/null and b/assets/img/guides/retry-ability/command-assertions.png differ
diff --git a/assets/img/guides/retry-ability/v10/delay-click.png b/assets/img/guides/retry-ability/delay-click.png
similarity index 100%
rename from assets/img/guides/retry-ability/v10/delay-click.png
rename to assets/img/guides/retry-ability/delay-click.png
diff --git a/assets/img/guides/retry-ability/v10/eq.gif b/assets/img/guides/retry-ability/eq.gif
similarity index 100%
rename from assets/img/guides/retry-ability/v10/eq.gif
rename to assets/img/guides/retry-ability/eq.gif
diff --git a/assets/img/guides/retry-ability/v10/random-number-callback.gif b/assets/img/guides/retry-ability/random-number-callback.gif
similarity index 100%
rename from assets/img/guides/retry-ability/v10/random-number-callback.gif
rename to assets/img/guides/retry-ability/random-number-callback.gif
diff --git a/assets/img/guides/retry-ability/v10/random-number-first-attempt.png b/assets/img/guides/retry-ability/random-number-first-attempt.png
similarity index 100%
rename from assets/img/guides/retry-ability/v10/random-number-first-attempt.png
rename to assets/img/guides/retry-ability/random-number-first-attempt.png
diff --git a/assets/img/guides/retry-ability/v10/random-number.gif b/assets/img/guides/retry-ability/random-number.gif
similarity index 100%
rename from assets/img/guides/retry-ability/v10/random-number.gif
rename to assets/img/guides/retry-ability/random-number.gif
diff --git a/assets/img/guides/retry-ability/retry-assertion.gif b/assets/img/guides/retry-ability/retry-assertion.gif
new file mode 100644
index 0000000000..a663d98fdd
Binary files /dev/null and b/assets/img/guides/retry-ability/retry-assertion.gif differ
diff --git a/assets/img/guides/retry-ability/v10/second-assertion-fails.gif b/assets/img/guides/retry-ability/second-assertion-fails.gif
similarity index 100%
rename from assets/img/guides/retry-ability/v10/second-assertion-fails.gif
rename to assets/img/guides/retry-ability/second-assertion-fails.gif
diff --git a/assets/img/guides/retry-ability/v10/adds-two-items-fails.gif b/assets/img/guides/retry-ability/v10/adds-two-items-fails.gif
deleted file mode 100644
index b1cb82fbce..0000000000
Binary files a/assets/img/guides/retry-ability/v10/adds-two-items-fails.gif and /dev/null differ
diff --git a/assets/img/guides/retry-ability/v10/adds-two-items-passes.gif b/assets/img/guides/retry-ability/v10/adds-two-items-passes.gif
deleted file mode 100644
index 3220cba47d..0000000000
Binary files a/assets/img/guides/retry-ability/v10/adds-two-items-passes.gif and /dev/null differ
diff --git a/assets/img/guides/retry-ability/v10/alternating-commands-assertions.png b/assets/img/guides/retry-ability/v10/alternating-commands-assertions.png
deleted file mode 100644
index 3a31361e90..0000000000
Binary files a/assets/img/guides/retry-ability/v10/alternating-commands-assertions.png and /dev/null differ
diff --git a/assets/img/guides/retry-ability/v10/combined-selectors.gif b/assets/img/guides/retry-ability/v10/combined-selectors.gif
deleted file mode 100644
index 27090fae4e..0000000000
Binary files a/assets/img/guides/retry-ability/v10/combined-selectors.gif and /dev/null differ
diff --git a/assets/img/guides/retry-ability/v10/command-assertions.png b/assets/img/guides/retry-ability/v10/command-assertions.png
deleted file mode 100644
index c0ea8a4450..0000000000
Binary files a/assets/img/guides/retry-ability/v10/command-assertions.png and /dev/null differ
diff --git a/assets/img/guides/retry-ability/v10/first-item-label.png b/assets/img/guides/retry-ability/v10/first-item-label.png
deleted file mode 100644
index b8ca376c4e..0000000000
Binary files a/assets/img/guides/retry-ability/v10/first-item-label.png and /dev/null differ
diff --git a/assets/img/guides/retry-ability/v10/retry-2-items.gif b/assets/img/guides/retry-ability/v10/retry-2-items.gif
deleted file mode 100644
index 3f3efb951c..0000000000
Binary files a/assets/img/guides/retry-ability/v10/retry-2-items.gif and /dev/null differ
diff --git a/assets/img/guides/retry-ability/v10/second-get-li.png b/assets/img/guides/retry-ability/v10/second-get-li.png
deleted file mode 100644
index b18a21529a..0000000000
Binary files a/assets/img/guides/retry-ability/v10/second-get-li.png and /dev/null differ
diff --git a/assets/img/guides/retry-ability/v10/second-item-label.png b/assets/img/guides/retry-ability/v10/second-item-label.png
deleted file mode 100644
index f7c3477c99..0000000000
Binary files a/assets/img/guides/retry-ability/v10/second-item-label.png and /dev/null differ
diff --git a/assets/img/guides/retry-ability/v10/two-items.png b/assets/img/guides/retry-ability/v10/two-items.png
deleted file mode 100644
index bb30637a32..0000000000
Binary files a/assets/img/guides/retry-ability/v10/two-items.png and /dev/null differ
diff --git a/content/_data/sidebar.json b/content/_data/sidebar.json
index d32bf3a13d..1293df44a4 100644
--- a/content/_data/sidebar.json
+++ b/content/_data/sidebar.json
@@ -475,73 +475,89 @@
             }
           ]
         },
-        {
-          "title": "Events",
-          "slug": "events",
-          "children": [
-            {
-              "title": "Catalog of Events",
-              "slug": "catalog-of-events"
-            }
-          ]
-        },
         {
           "title": "Assertions",
-          "slug": "assertions",
+          "slug": "commands",
           "children": [
             {
-              "title": "All Assertions",
+              "title": "Assertions Reference",
               "redirect": "/guides/references/assertions"
+            },
+            {
+              "title": "and",
+              "slug": "and"
+            },
+            {
+              "title": "should",
+              "slug": "should"
             }
           ]
         },
         {
-          "title": "Commands",
+          "title": "Actions",
           "slug": "commands",
           "children": [
             {
-              "title": "and",
-              "slug": "and"
+              "title": "Actionability Guide",
+              "redirect": "/guides/core-concepts/interacting-with-elements"
             },
             {
-              "title": "as",
-              "slug": "as"
+              "title": "clear",
+              "slug": "clear"
             },
             {
-              "title": "blur",
-              "slug": "blur"
+              "title": "click",
+              "slug": "click"
             },
             {
               "title": "check",
               "slug": "check"
             },
             {
-              "title": "children",
-              "slug": "children"
+              "title": "dblclick",
+              "slug": "dblclick"
             },
             {
-              "title": "clear",
-              "slug": "clear"
+              "title": "rightclick",
+              "slug": "rightclick"
             },
             {
-              "title": "clearCookie",
-              "slug": "clearcookie"
+              "title": "select",
+              "slug": "select"
             },
             {
-              "title": "clearCookies",
-              "slug": "clearcookies"
+              "title": "selectFile",
+              "slug": "selectfile"
             },
             {
-              "title": "clearLocalStorage",
-              "slug": "clearlocalstorage"
+              "title": "trigger",
+              "slug": "trigger"
             },
             {
-              "title": "click",
-              "slug": "click"
+              "title": "type",
+              "slug": "type"
             },
             {
-              "title": "clock",
-              "slug": "clock"
+              "title": "uncheck",
+              "slug": "uncheck"
+            }
+          ]
+        },
+        {
+          "title": "Queries",
+          "slug": "commands",
+          "children": [
+            {
+              "title": "Retry-ability Guide",
+              "redirect": "/guides/core-concepts/retry-ability"
+            },
+            {
+              "title": "as",
+              "slug": "as"
+            },
+            {
+              "title": "children",
+              "slug": "children"
             },
             {
               "title": "closest",
@@ -551,10 +567,6 @@
               "title": "contains",
               "slug": "contains"
             },
-            {
-              "title": "dblclick",
-              "slug": "dblclick"
-            },
             {
               "title": "debug",
               "slug": "debug"
@@ -563,22 +575,10 @@
               "title": "document",
               "slug": "document"
             },
-            {
-              "title": "each",
-              "slug": "each"
-            },
-            {
-              "title": "end",
-              "slug": "end"
-            },
             {
               "title": "eq",
               "slug": "eq"
             },
-            {
-              "title": "exec",
-              "slug": "exec"
-            },
             {
               "title": "filter",
               "slug": "filter"
@@ -591,14 +591,6 @@
               "title": "first",
               "slug": "first"
             },
-            {
-              "title": "fixture",
-              "slug": "fixture"
-            },
-            {
-              "title": "focus",
-              "slug": "focus"
-            },
             {
               "title": "focused",
               "slug": "focused"
@@ -607,30 +599,10 @@
               "title": "get",
               "slug": "get"
             },
-            {
-              "title": "getCookie",
-              "slug": "getcookie"
-            },
-            {
-              "title": "getCookies",
-              "slug": "getcookies"
-            },
-            {
-              "title": "go",
-              "slug": "go"
-            },
             {
               "title": "hash",
               "slug": "hash"
             },
-            {
-              "title": "hover",
-              "slug": "hover"
-            },
-            {
-              "title": "intercept",
-              "slug": "intercept"
-            },
             {
               "title": "invoke",
               "slug": "invoke"
@@ -647,14 +619,6 @@
               "title": "location",
               "slug": "location"
             },
-            {
-              "title": "log",
-              "slug": "log"
-            },
-            {
-              "title": "mount",
-              "slug": "mount"
-            },
             {
               "title": "next",
               "slug": "next"
@@ -671,10 +635,6 @@
               "title": "not",
               "slug": "not"
             },
-            {
-              "title": "origin",
-              "slug": "origin"
-            },
             {
               "title": "parent",
               "slug": "parent"
@@ -687,10 +647,6 @@
               "title": "parentsUntil",
               "slug": "parentsuntil"
             },
-            {
-              "title": "pause",
-              "slug": "pause"
-            },
             {
               "title": "prev",
               "slug": "prev"
@@ -703,6 +659,112 @@
               "title": "prevUntil",
               "slug": "prevuntil"
             },
+            {
+              "title": "root",
+              "slug": "root"
+            },
+            {
+              "title": "shadow",
+              "slug": "shadow"
+            },
+            {
+              "title": "siblings",
+              "slug": "siblings"
+            },
+            {
+              "title": "title",
+              "slug": "title"
+            },
+            {
+              "title": "url",
+              "slug": "url"
+            },
+            {
+              "title": "window",
+              "slug": "window"
+            }
+          ]
+        },
+        {
+          "title": "Other Commands",
+          "slug": "commands",
+          "children": [
+            {
+              "title": "blur",
+              "slug": "blur"
+            },
+            {
+              "title": "clearCookie",
+              "slug": "clearcookie"
+            },
+            {
+              "title": "clearCookies",
+              "slug": "clearcookies"
+            },
+            {
+              "title": "clearLocalStorage",
+              "slug": "clearlocalstorage"
+            },
+            {
+              "title": "clock",
+              "slug": "clock"
+            },
+            {
+              "title": "each",
+              "slug": "each"
+            },
+            {
+              "title": "end",
+              "slug": "end"
+            },
+            {
+              "title": "exec",
+              "slug": "exec"
+            },
+            {
+              "title": "fixture",
+              "slug": "fixture"
+            },
+            {
+              "title": "focus",
+              "slug": "focus"
+            },
+            {
+              "title": "getCookie",
+              "slug": "getcookie"
+            },
+            {
+              "title": "getCookies",
+              "slug": "getcookies"
+            },
+            {
+              "title": "go",
+              "slug": "go"
+            },
+            {
+              "title": "hover",
+              "slug": "hover"
+            },
+            {
+              "title": "intercept",
+              "slug": "intercept"
+            },
+            {
+              "title": "log",
+              "slug": "log"
+            },
+            {
+              "title": "mount",
+              "slug": "mount"
+            },
+            {
+              "title": "origin",
+              "slug": "origin"
+            },
+            {
+              "title": "pause",
+              "slug": "pause"
+            },
             {
               "title": "readFile",
               "slug": "readfile"
@@ -715,14 +777,6 @@
               "title": "request",
               "slug": "request"
             },
-            {
-              "title": "rightclick",
-              "slug": "rightclick"
-            },
-            {
-              "title": "root",
-              "slug": "root"
-            },
             {
               "title": "screenshot",
               "slug": "screenshot"
@@ -735,14 +789,6 @@
               "title": "scrollTo",
               "slug": "scrollto"
             },
-            {
-              "title": "select",
-              "slug": "select"
-            },
-            {
-              "title": "selectFile",
-              "slug": "selectfile"
-            },
             {
               "title": "session",
               "slug": "session"
@@ -751,18 +797,6 @@
               "title": "setCookie",
               "slug": "setcookie"
             },
-            {
-              "title": "shadow",
-              "slug": "shadow"
-            },
-            {
-              "title": "should",
-              "slug": "should"
-            },
-            {
-              "title": "siblings",
-              "slug": "siblings"
-            },
             {
               "title": "spread",
               "slug": "spread"
@@ -791,26 +825,6 @@
               "title": "tick",
               "slug": "tick"
             },
-            {
-              "title": "title",
-              "slug": "title"
-            },
-            {
-              "title": "trigger",
-              "slug": "trigger"
-            },
-            {
-              "title": "type",
-              "slug": "type"
-            },
-            {
-              "title": "uncheck",
-              "slug": "uncheck"
-            },
-            {
-              "title": "url",
-              "slug": "url"
-            },
             {
               "title": "viewport",
               "slug": "viewport"
@@ -824,23 +838,29 @@
               "slug": "wait"
             },
             {
-              "title": "window",
-              "slug": "window"
+              "title": "wrap",
+              "slug": "wrap"
             },
             {
               "title": "within",
               "slug": "within"
             },
-            {
-              "title": "wrap",
-              "slug": "wrap"
-            },
             {
               "title": "writeFile",
               "slug": "writefile"
             }
           ]
         },
+        {
+          "title": "Events",
+          "slug": "events",
+          "children": [
+            {
+              "title": "Catalog of Events",
+              "slug": "catalog-of-events"
+            }
+          ]
+        },
         {
           "title": "Utilities",
           "slug": "utilities",
@@ -880,9 +900,13 @@
           "slug": "cypress-api",
           "children": [
             {
-              "title": "Commands",
+              "title": "Custom Commands",
               "slug": "custom-commands"
             },
+            {
+              "title": "Custom Queries",
+              "slug": "custom-queries"
+            },
             {
               "title": "Cookies",
               "slug": "cookies"
diff --git a/content/api/commands/and.md b/content/api/commands/and.md
index ae1953a285..42cc46e27a 100644
--- a/content/api/commands/and.md
+++ b/content/api/commands/and.md
@@ -2,8 +2,8 @@
 title: and
 ---
 
-Create an assertion. Assertions are automatically retried until they pass or
-time out.
+Create an assertion. Assertions are automatically retried as part of the
+previous command until they pass or time out.
 
 <Alert type="info">
 
@@ -33,7 +33,9 @@ An alias of [`.should()`](/api/commands/should)
 
 ```javascript
 cy.get('.err').should('be.empty').and('be.hidden') // Assert '.err' is empty & hidden
+
 cy.contains('Login').and('be.visible') // Assert el is visible
+
 cy.wrap({ foo: 'bar' })
   .should('have.property', 'foo') // Assert 'foo' property exists
   .and('eq', 'bar') // Assert 'foo' property is 'bar'
@@ -42,7 +44,10 @@ cy.wrap({ foo: 'bar' })
 **<Icon name="exclamation-triangle" color="red"></Icon> Incorrect Usage**
 
 ```javascript
-cy.and('eq', '42') // Should not be chained off 'cy'
+cy.and('eq', '42') // Can not be chained off 'cy'
+
+cy.get('button').click().and('be.focused') // Should not be chained off
+// action commands that may update the DOM
 ```
 
 ### Arguments
@@ -68,8 +73,9 @@ Whatever was passed to the function is what is yielded.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>In most cases, `.and()` yields the same subject it was given from the
-previous command.</li></List>
+- In most cases, `.and()` yields the same subject it was given.
+- `.and()` is an assertion, and it is _safe_ to chain further commands that use
+  the subject.
 
 ```javascript
 cy.get('nav') // yields <nav>
diff --git a/content/api/commands/as.md b/content/api/commands/as.md
index 210b9f621a..5b5d830b6a 100644
--- a/content/api/commands/as.md
+++ b/content/api/commands/as.md
@@ -3,8 +3,8 @@ title: as
 ---
 
 Assign an alias for later use. Reference the alias later within a
-[`cy.get()`](/api/commands/get) or [`cy.wait()`](/api/commands/wait) command
-with an `@` prefix.
+[`cy.get()`](/api/commands/get) query or [`cy.wait()`](/api/commands/wait)
+command with an `@` prefix.
 
 <Alert type="info">
 
@@ -46,8 +46,8 @@ using an `@` prefix.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.as()` yields the same subject it was given from the previous
-command.</li></List>
+- `.as()` yields the same subject it was given.
+- It is _safe_ to chain further commands after `.as()`.
 
 ## Examples
 
diff --git a/content/api/commands/blur.md b/content/api/commands/blur.md
index 77fff55a80..2fa7f12a6b 100644
--- a/content/api/commands/blur.md
+++ b/content/api/commands/blur.md
@@ -4,12 +4,20 @@ title: blur
 
 Blur a focused element.
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.blur()`.
+
 <Alert type="warning">
 
 This element must currently be in focus. If you want to ensure an element is
 focused before blurring, try using [`.focus()`](/api/commands/focus) before
 `.blur()`.
 
+```javascript
+cy.get('button').as('btn').focus()
+cy.get('@btn').blur()
+```
+
 </Alert>
 
 ## Syntax
@@ -24,8 +32,8 @@ focused before blurring, try using [`.focus()`](/api/commands/focus) before
 **<Icon name="check-circle" color="green"></Icon> Correct Usage**
 
 ```javascript
-cy.get('[type="email"]').type('me@email.com').blur() // Blur email input
-cy.get('[tabindex="1"]').focus().blur() // Blur el with tabindex
+cy.get('[type="email"]').blur() // Blur email input
+cy.get('[tabindex="1"]').blur() // Blur el with tabindex
 ```
 
 **<Icon name="exclamation-triangle" color="red"></Icon> Incorrect Usage**
@@ -49,8 +57,9 @@ Pass in an options object to change the default behavior of `.blur`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.blur()` yields the same subject it was given from the previous
-command.</li></List>
+- `.blur()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.blur()`.
 
 ## Examples
 
diff --git a/content/api/commands/check.md b/content/api/commands/check.md
index d16214a80e..336c690157 100644
--- a/content/api/commands/check.md
+++ b/content/api/commands/check.md
@@ -4,6 +4,9 @@ title: check
 
 Check checkbox(es) or radio(s).
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.check()`.
+
 <Alert type="warning">
 
 This element must be an `<input>` with type `checkbox` or `radio`.
@@ -62,8 +65,9 @@ Pass in an options object to change the default behavior of `.check()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.check()` yields the same subject it was given from the previous
-command.</li></List>
+- `.check()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.check()`.
 
 ## Examples
 
diff --git a/content/api/commands/children.md b/content/api/commands/children.md
index 88fc345442..0dd5e42d83 100644
--- a/content/api/commands/children.md
+++ b/content/api/commands/children.md
@@ -52,7 +52,8 @@ Pass in an options object to change the default behavior of `.children()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.children()` yields the new DOM element(s) it found.</li></List>
+- `.children()` yields the new DOM element(s) it found.
+- `.children()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/clear.md b/content/api/commands/clear.md
index 4c7a0e03a7..811fb6e78e 100644
--- a/content/api/commands/clear.md
+++ b/content/api/commands/clear.md
@@ -4,6 +4,9 @@ title: clear
 
 Clear the value of an `input` or `textarea`.
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.clear()`.
+
 <Alert type="info">
 
 An alias for [`.type('{selectall}{backspace}')`](/api/commands/type)
@@ -52,8 +55,9 @@ Pass in an options object to change the default behavior of `.clear()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.clear()` yields the same subject it was given from the previous
-command.</li></List>
+- `.clear()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.clear()`.
 
 ## Examples
 
diff --git a/content/api/commands/clearcookie.md b/content/api/commands/clearcookie.md
index 1d2d198c30..fdd143b500 100644
--- a/content/api/commands/clearcookie.md
+++ b/content/api/commands/clearcookie.md
@@ -45,8 +45,7 @@ Pass in an options object to change the default behavior of `cy.clearCookie()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`cy.clearCookie()` yields `null`.</li><li>`cy.clearCookie()` cannot be
-chained further.</li></List>
+- `cy.clearCookie()` yields `null`.
 
 ## Examples
 
diff --git a/content/api/commands/clearcookies.md b/content/api/commands/clearcookies.md
index 46a50a1c88..f3c319a14d 100644
--- a/content/api/commands/clearcookies.md
+++ b/content/api/commands/clearcookies.md
@@ -41,8 +41,7 @@ Pass in an options object to change the default behavior of `cy.clearCookies()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`cy.clearCookies()` yields `null`.</li><li>`cy.clearCookies()` cannot
-be chained further.</li></List>
+- `cy.clearCookies()` yields `null`.
 
 ## Examples
 
diff --git a/content/api/commands/clearlocalstorage.md b/content/api/commands/clearlocalstorage.md
index 4316c43578..d38faf2366 100644
--- a/content/api/commands/clearlocalstorage.md
+++ b/content/api/commands/clearlocalstorage.md
@@ -46,8 +46,7 @@ Pass in an options object to change the default behavior of
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`cy.clearLocalStorage()` yields
-`null`.</li><li>`cy.clearLocalStorage()` cannot be chained further.</li></List>
+- `cy.clearLocalStorage()` yields `null`.
 
 ## Examples
 
diff --git a/content/api/commands/click.md b/content/api/commands/click.md
index 76b7d4e4ea..84f72f9019 100644
--- a/content/api/commands/click.md
+++ b/content/api/commands/click.md
@@ -4,6 +4,9 @@ title: click
 
 Click a DOM element.
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.click()`.
+
 ## Syntax
 
 ```javascript
@@ -70,8 +73,9 @@ Pass in an options object to change the default behavior of `.click()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.click()` yields the same subject it was given from the previous
-command.</li></List>
+- `.click()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.click()`.
 
 ## Examples
 
diff --git a/content/api/commands/closest.md b/content/api/commands/closest.md
index 9eb654415c..e3c7c778c4 100644
--- a/content/api/commands/closest.md
+++ b/content/api/commands/closest.md
@@ -51,7 +51,8 @@ Pass in an options object to change the default behavior of `.closest()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.closest()` yields the new DOM element(s) it found.</li></List>
+- `.closest()` yields the new DOM element(s) it found.
+- `.closest()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/contains.md b/content/api/commands/contains.md
index a5b466df43..682627a3ff 100644
--- a/content/api/commands/contains.md
+++ b/content/api/commands/contains.md
@@ -64,7 +64,8 @@ Pass in an options object to change the default behavior of `.contains()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.contains()` yields the new DOM element it found.</li></List>
+- `.contains()` yields the new DOM element it found.
+- `.contains()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/dblclick.md b/content/api/commands/dblclick.md
index 5b7b9e6370..f1628984ea 100644
--- a/content/api/commands/dblclick.md
+++ b/content/api/commands/dblclick.md
@@ -4,6 +4,9 @@ title: dblclick
 
 Double-click a DOM element.
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.dblclick()`.
+
 ## Syntax
 
 ```javascript
@@ -70,8 +73,9 @@ Pass in an options object to change the default behavior of `.dblclick()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.dblclick()` yields the same subject it was given from the previous
-command.</li></List>
+- `.dblclick()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.dblclick()`.
 
 ## Examples
 
diff --git a/content/api/commands/debug.md b/content/api/commands/debug.md
index 658d18873b..9cb80e374a 100644
--- a/content/api/commands/debug.md
+++ b/content/api/commands/debug.md
@@ -43,8 +43,8 @@ Pass in an options object to change the default behavior of `.debug()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.debug()` yields the same subject it was given from the previous
-command.</li></List>
+- `.debug()` yields the same subject it was given from the previous command.
+- `.debug()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/document.md b/content/api/commands/document.md
index 20a5885cde..d3a432badd 100644
--- a/content/api/commands/document.md
+++ b/content/api/commands/document.md
@@ -32,7 +32,8 @@ Pass in an options object to change the default behavior of `cy.document()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`cy.document()` 'yields the `window.document` object' </li></List>
+- `cy.document()` 'yields the `window.document` object.
+- `cy.document()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/each.md b/content/api/commands/each.md
index e40e094d5e..ddecf40c32 100644
--- a/content/api/commands/each.md
+++ b/content/api/commands/each.md
@@ -5,6 +5,9 @@ title: each
 Iterate through an array like structure (arrays or objects with a `length`
 property).
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.each()`.
+
 ## Syntax
 
 ```javascript
@@ -40,8 +43,9 @@ Pass a function that is invoked with the following arguments:
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.each()` yields the same subject it was given from the previous
-command.</li></List>
+- `.each()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.each()`.
 
 ## Examples
 
diff --git a/content/api/commands/end.md b/content/api/commands/end.md
index 301aa2e8f5..a47665da6f 100644
--- a/content/api/commands/end.md
+++ b/content/api/commands/end.md
@@ -21,13 +21,12 @@ cy.contains('ul').end() // Yield 'null' instead of 'ul' element
 **<Icon name="exclamation-triangle" color="red"></Icon> Incorrect Usage**
 
 ```javascript
-cy.end() // Does not make sense to chain off 'cy'
+cy.end()
 ```
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.end()` yields `null`.</li><li>`.end()` cannot be chained
-further.</li></List>
+- `.end()` yields `null`.
 
 ## Examples
 
diff --git a/content/api/commands/eq.md b/content/api/commands/eq.md
index 10566cd838..5e1c1a865b 100644
--- a/content/api/commands/eq.md
+++ b/content/api/commands/eq.md
@@ -59,7 +59,8 @@ Pass in an options object to change the default behavior of `.eq()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.eq()` yields the new DOM element(s) it found.</li></List>
+- `.eq()` yields the new DOM element it found.
+- `.eq()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/filter.md b/content/api/commands/filter.md
index da3709948f..ce913d6af8 100644
--- a/content/api/commands/filter.md
+++ b/content/api/commands/filter.md
@@ -56,7 +56,8 @@ Pass in an options object to change the default behavior of `.filter()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.filter()` yields the new DOM element(s) it found.</li></List>
+- `.filter()` yields the new DOM element(s) it found.
+- `.filter()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/find.md b/content/api/commands/find.md
index 42d7b56cd8..3159f519ea 100644
--- a/content/api/commands/find.md
+++ b/content/api/commands/find.md
@@ -51,7 +51,8 @@ Pass in an options object to change the default behavior of `.find()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.find()` yields the new DOM element(s) it found.</li></List>
+- `.find()` yields the new DOM element(s) it found.
+- `.find()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/first.md b/content/api/commands/first.md
index 349ccc1ad2..6efa4d28f3 100644
--- a/content/api/commands/first.md
+++ b/content/api/commands/first.md
@@ -46,7 +46,8 @@ Pass in an options object to change the default behavior of `.first()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.first()` yields the new DOM element(s) it found.</li></List>
+- `.first()` yields the new DOM element it found.
+- `.first()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/fixture.md b/content/api/commands/fixture.md
index 4baa0610bf..94d2c75a7a 100644
--- a/content/api/commands/fixture.md
+++ b/content/api/commands/fixture.md
@@ -71,8 +71,9 @@ Pass in an options object to change the default behavior of `cy.fixture()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-`cy.fixture()` yields the contents of the file. Formatting is determined by its
-file extension.
+- `cy.fixture()` yields the contents of the file. Formatting is determined by
+  its file extension.
+- The yielded subject is **not** updated if the contents change on disk.
 
 ## Examples
 
diff --git a/content/api/commands/focus.md b/content/api/commands/focus.md
index 5d46373565..8203396341 100644
--- a/content/api/commands/focus.md
+++ b/content/api/commands/focus.md
@@ -4,6 +4,9 @@ title: focus
 
 Focus on a DOM element.
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.focus()`.
+
 ## Syntax
 
 ```javascript
@@ -39,8 +42,9 @@ Pass in an options object to change the default behavior of `.focus()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.focus()` yields the same subject it was given from the previous
-command.</li></List>
+- `.focus()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.focus()`.
 
 ## Examples
 
diff --git a/content/api/commands/focused.md b/content/api/commands/focused.md
index 76fabdd81d..f496731fce 100644
--- a/content/api/commands/focused.md
+++ b/content/api/commands/focused.md
@@ -32,7 +32,8 @@ Pass in an options object to change the default behavior of `cy.focused()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`cy.focused()` yields the DOM element(s) it found.</li></List>
+- `cy.focused()` yields the DOM element it found.
+- `cy.focused()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/get.md b/content/api/commands/get.md
index 6d4be79974..4807a11688 100644
--- a/content/api/commands/get.md
+++ b/content/api/commands/get.md
@@ -67,7 +67,9 @@ Pass in an options object to change the default behavior of `cy.get()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`cy.get()` yields the DOM element(s) it found.</li></List>
+- `cy.get()` yields the DOM element(s) it found, or the results of the alias
+  lookup.
+- `cy.get()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/getcookie.md b/content/api/commands/getcookie.md
index 4222b4121f..750d551c59 100644
--- a/content/api/commands/getcookie.md
+++ b/content/api/commands/getcookie.md
@@ -48,6 +48,9 @@ Pass in an options object to change the default behavior of `cy.getCookie()`.
 - `secure`
 - `value`
 
+`cy.getCookie()` is not a query. It will not retry, or wait for the requested
+cookie to exist.
+
 #### When a cookie matching the name could not be found:
 
 `cy.getCookie()` yields `null`.
diff --git a/content/api/commands/getcookies.md b/content/api/commands/getcookies.md
index af83e8a677..eb26c5baee 100644
--- a/content/api/commands/getcookies.md
+++ b/content/api/commands/getcookies.md
@@ -45,6 +45,9 @@ following properties:
 - `secure`
 - `value`
 
+`cy.getCookies()` is not a query. It will not update the returned list if
+further cookies are added after it initially executes.
+
 ## Examples
 
 ### Get Cookies
diff --git a/content/api/commands/go.md b/content/api/commands/go.md
index a44b16b62d..07292c191d 100644
--- a/content/api/commands/go.md
+++ b/content/api/commands/go.md
@@ -41,9 +41,9 @@ Pass in an options object to change the default behavior of `cy.go()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`cy.go()` 'yields the `window` object after the page finishes loading'
-
-</li></List>
+- `cy.go()` yields the `window` object after the page finishes loading.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the yielded `window` after `cy.go()`.
 
 ## Examples
 
diff --git a/content/api/commands/hash.md b/content/api/commands/hash.md
index 08e9e608b7..4b5cd551b4 100644
--- a/content/api/commands/hash.md
+++ b/content/api/commands/hash.md
@@ -41,14 +41,11 @@ Pass in an options object to change the default behavior of `cy.hash()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-#### When the current URL contains a hash:
-
-<List><li>`cy.hash()` "yields the current URL's hash (including the `#`
-character)" </li></List>
-
-#### When the current URL does not contain a hash:
-
-<List><li>`cy.hash()` "yields an empty string" </li></List>
+- When the current URL contains a hash, `cy.hash()` yields the current URL's
+  hash (including the `#` character).
+- When the current URL does not contain a hash, `cy.hash()` yields an empty
+  string.
+- `cy.hash()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/intercept.md b/content/api/commands/intercept.md
index bcef84fa4d..18dbdeb0a4 100644
--- a/content/api/commands/intercept.md
+++ b/content/api/commands/intercept.md
@@ -154,8 +154,7 @@ See ["Intercepted requests"][req] and
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-- `cy.intercept()` yields `null`.
-- `cy.intercept()` can be aliased, but otherwise cannot be chained further.
+- `cy.intercept()` yields `null`, but can be aliased.
 - Waiting on an aliased `cy.intercept()` route using
   [cy.wait()](/api/commands/wait) will yield an object that contains information
   about the matching request/response cycle. See
diff --git a/content/api/commands/invoke.md b/content/api/commands/invoke.md
index f67abab52c..7489e2b25d 100644
--- a/content/api/commands/invoke.md
+++ b/content/api/commands/invoke.md
@@ -11,6 +11,14 @@ subject, use [`.its()`](/api/commands/its).
 
 </Alert>
 
+<Alert type="warn">
+
+If you chain further commands off of `.invoke()`, it will be called multiple
+times. If you only want the method to be called once, end your chain with
+`.invoke()` and start fresh with `cy` afterwards.
+
+</Alert>
+
 ## Syntax
 
 ```javascript
@@ -26,8 +34,9 @@ subject, use [`.its()`](/api/commands/its).
 **<Icon name="check-circle" color="green"></Icon> Correct Usage**
 
 ```javascript
-cy.wrap({ animate: fn }).invoke('animate') // Invoke the 'animate' function
+cy.get('.input').invoke('val').should('eq', 'foo') // Invoke the 'val' function
 cy.get('.modal').invoke('show') // Invoke the jQuery 'show' function
+cy.wrap({ animate: fn }).invoke('animate') // Invoke the 'animate' function
 ```
 
 **<Icon name="exclamation-triangle" color="red"></Icon> Incorrect Usage**
@@ -35,6 +44,9 @@ cy.get('.modal').invoke('show') // Invoke the jQuery 'show' function
 ```javascript
 cy.invoke('convert') // Errors, cannot be chained off 'cy'
 cy.wrap({ name: 'Jane' }).invoke('name') // Errors, 'name' is not a function
+cy.wrap({ animate: fn })
+  .invoke('animate')
+  .then(() => {}) // 'animate' will be called multiple times
 ```
 
 ### Arguments
@@ -57,6 +69,13 @@ Pass in an options object to change the default behavior of `.invoke()`.
 Additional arguments to be given to the function call. There is no limit to the
 number of arguments.
 
+### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
+
+- `.invoke()` yields the return value of the method.
+- `.invoke()` is a query, and it is _safe_ to chain further commands.
+- If you chain additional commands off of `.invoke()`, the function will be
+  called multiple times!
+
 ## Examples
 
 ### Function
@@ -143,53 +162,6 @@ const double = (n) => n * n
 cy.wrap([reverse, double]).invoke(1, 4).should('eq', 16)
 ```
 
-### Invoking an async function
-
-In this example we have a little text input field and we invoke an async action
-which will disable this input field. `.invoke()` will then wait until the
-Promise resolves and only then will continue executing to check if it really has
-been disabled.
-
-Our input field
-
-```html
-<input type="text" name="text" data-cy="my-text-input" />
-```
-
-The Cypress test with `cy.invoke()` awaiting the promise:
-
-```javascript
-function disableElementAsync(element) {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      element.disabled = true
-      resolve()
-    }, 3000)
-  })
-}
-
-cy.get('[data-cy=my-text-input]').then((textElements) => {
-  cy.wrap({ disableElementAsync }).invoke(
-    'disableElementAsync',
-    textElements[0]
-  )
-})
-
-// log message appears after 3 seconds
-cy.log('after invoke')
-
-// assert UI
-cy.get('[data-cy=my-text-input]').should('be.disabled')
-```
-
-<Alert type="info">
-
-For a full example where invoke is used to await async Vuex store actions, visit
-the recipe:
-[Vue + Vuex + REST](https://github.com/cypress-io/cypress-example-recipes)
-
-</Alert>
-
 ### jQuery method
 
 If the parent command yields a jQuery element, we can invoke a jQuery method,
@@ -309,10 +281,11 @@ following:
 
 ## History
 
-| Version                                     | Changes                                                       |
-| ------------------------------------------- | ------------------------------------------------------------- |
-| [3.8.0](/guides/references/changelog#3-8-0) | Added support for `options` argument                          |
-| [3.7.0](/guides/references/changelog#3-7-0) | Added support for arguments of type Number for `functionName` |
+| Version                                       | Changes                                                       |
+| --------------------------------------------- | ------------------------------------------------------------- |
+| [12.0.0](/guides/references/changelog#12-0-0) | `.invoke()` no longer supports promises or async functions    |
+| [3.8.0](/guides/references/changelog#3-8-0)   | Added support for `options` argument                          |
+| [3.7.0](/guides/references/changelog#3-7-0)   | Added support for arguments of type Number for `functionName` |
 
 ## See also
 
diff --git a/content/api/commands/its.md b/content/api/commands/its.md
index b64b0ccdd5..21a074ca8e 100644
--- a/content/api/commands/its.md
+++ b/content/api/commands/its.md
@@ -51,7 +51,8 @@ Pass in an options object to change the default behavior of `.its()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.its()` 'yields the value of the property' </li></List>
+- `.its()` 'yields the value of the property.
+- `.its()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/last.md b/content/api/commands/last.md
index b7ae14342d..44fa686235 100644
--- a/content/api/commands/last.md
+++ b/content/api/commands/last.md
@@ -46,7 +46,8 @@ Pass in an options object to change the default behavior of `.last()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.last()` yields the new DOM element(s) it found.</li></List>
+- `.last()` yields the new DOM element it found.
+- `.last()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/location.md b/content/api/commands/location.md
index 92782585cb..9f1a2776d6 100644
--- a/content/api/commands/location.md
+++ b/content/api/commands/location.md
@@ -42,6 +42,10 @@ Pass in an options object to change the default behavior of `cy.location()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
+`cy.location()` is a query, and it is _safe_ to chain further commands.
+
+#### When not given a `key` argument:
+
 `cy.location()` yields the location object with the following properties:
 
 - `hash`
diff --git a/content/api/commands/log.md b/content/api/commands/log.md
index 85deed5145..0e97b4f499 100644
--- a/content/api/commands/log.md
+++ b/content/api/commands/log.md
@@ -33,8 +33,7 @@ to the number of arguments.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`cy.log()` yields `null`.</li><li>`cy.log()` cannot be chained
-further.</li></List>
+- `cy.log()` yields `null`.
 
 ## Examples
 
diff --git a/content/api/commands/next.md b/content/api/commands/next.md
index 8902bfdfe6..699702cb7c 100644
--- a/content/api/commands/next.md
+++ b/content/api/commands/next.md
@@ -53,7 +53,8 @@ Pass in an options object to change the default behavior of `.next()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.next()` yields the new DOM element(s) it found.</li></List>
+- `.next()` yields the new DOM element(s) it found.
+- `.next()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/nextall.md b/content/api/commands/nextall.md
index 6291096b1a..296d02f63f 100644
--- a/content/api/commands/nextall.md
+++ b/content/api/commands/nextall.md
@@ -52,7 +52,8 @@ Pass in an options object to change the default behavior of `.nextAll()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.nextAll()` yields the new DOM element(s) it found.</li></List>
+- `.nextAll()` yields the new DOM element(s) it found.
+- `.nextAll()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/nextuntil.md b/content/api/commands/nextuntil.md
index 5fe9abce8c..59b6ff08e2 100644
--- a/content/api/commands/nextuntil.md
+++ b/content/api/commands/nextuntil.md
@@ -63,7 +63,8 @@ Pass in an options object to change the default behavior of `.nextUntil()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.nextUntil()` yields the new DOM element(s) it found.</li></List>
+- `.nextUntil()` yields the new DOM element(s) it found.
+- `.nextUntil()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/not.md b/content/api/commands/not.md
index 39a9ee9f8f..acd4bfc06f 100644
--- a/content/api/commands/not.md
+++ b/content/api/commands/not.md
@@ -56,7 +56,8 @@ Pass in an options object to change the default behavior of `.not()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.not()` yields the new DOM element(s) it found.</li></List>
+- `.not()` yields the new DOM element(s) it found.
+- `.not()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/parent.md b/content/api/commands/parent.md
index 212df8e2a6..0116c02e91 100644
--- a/content/api/commands/parent.md
+++ b/content/api/commands/parent.md
@@ -55,7 +55,8 @@ Pass in an options object to change the default behavior of `.parent()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.parent()` yields the new DOM element(s) it found.</li></List>
+- `.parent()` yields the new DOM element(s) it found.
+- `.parent()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/parents.md b/content/api/commands/parents.md
index faf4d04a0c..6fc747025e 100644
--- a/content/api/commands/parents.md
+++ b/content/api/commands/parents.md
@@ -56,7 +56,8 @@ Pass in an options object to change the default behavior of `.parents()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.parents()` yields the new DOM element(s) it found.</li></List>
+- `.parents()` yields the new DOM element(s) it found.
+- `.parents()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/parentsuntil.md b/content/api/commands/parentsuntil.md
index 72a5648ac9..094d35bcd9 100644
--- a/content/api/commands/parentsuntil.md
+++ b/content/api/commands/parentsuntil.md
@@ -63,7 +63,8 @@ Pass in an options object to change the default behavior of `.parentsUntil()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.parentsUntil()` yields the new DOM element(s) it found.</li></List>
+- `.parentsUntil()` yields the new DOM element(s) it found.
+- `.parentsUntil()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/pause.md b/content/api/commands/pause.md
index 075858c6aa..7c4ddb5b15 100644
--- a/content/api/commands/pause.md
+++ b/content/api/commands/pause.md
@@ -6,6 +6,10 @@ Stop `cy` commands from running and allow interaction with the application under
 test. You can then "resume" running all commands or choose to step through the
 "next" commands from the Command Log.
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on a DOM element as the subject after
+`.pause()`.
+
 <Alert type="info">
 
 This does not set a `debugger` in your code, unlike
@@ -44,8 +48,10 @@ Pass in an options object to change the default behavior of `.pause()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.pause()` yields the same subject it was given from the previous
-command.</li></List>
+- `.pause()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on a DOM element as the subject after
+  `.pause()`.
 
 ## Examples
 
diff --git a/content/api/commands/prev.md b/content/api/commands/prev.md
index f1b369d6f6..98348951ca 100644
--- a/content/api/commands/prev.md
+++ b/content/api/commands/prev.md
@@ -52,7 +52,8 @@ Pass in an options object to change the default behavior of `.prev()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.prev()` yields the new DOM element(s) it found.</li></List>
+- `.prev()` yields the new DOM element(s) it found.
+- `.prev()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/prevall.md b/content/api/commands/prevall.md
index 142106882b..dc86033c84 100644
--- a/content/api/commands/prevall.md
+++ b/content/api/commands/prevall.md
@@ -52,7 +52,8 @@ Pass in an options object to change the default behavior of `.prevAll()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.prevAll()` yields the new DOM element(s) it found.</li></List>
+- `.prevAll()` yields the new DOM element(s) it found.
+- `.prevAll()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/prevuntil.md b/content/api/commands/prevuntil.md
index f3f45d7452..2bc2a84220 100644
--- a/content/api/commands/prevuntil.md
+++ b/content/api/commands/prevuntil.md
@@ -63,7 +63,8 @@ Pass in an options object to change the default behavior of `.prevUntil()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.prevUntil()` yields the new DOM element(s) it found.</li></List>
+- `.prevUntil()` yields the new DOM element(s) it found.
+- `.prevUntil()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/readfile.md b/content/api/commands/readfile.md
index 0973103d3f..175fdf7723 100644
--- a/content/api/commands/readfile.md
+++ b/content/api/commands/readfile.md
@@ -62,6 +62,8 @@ Pass in an options object to change the default behavior of `cy.readFile()`.
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
 - `cy.readFile()` yields the contents of the file.
+- The file will not be read from disk again if the results are stored in an
+  alias.
 
 ## Examples
 
diff --git a/content/api/commands/reload.md b/content/api/commands/reload.md
index 107058dd0a..dec0a402c9 100644
--- a/content/api/commands/reload.md
+++ b/content/api/commands/reload.md
@@ -38,8 +38,10 @@ reload without cache.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`cy.reload()` 'yields the `window` object after the page finishes
-loading' </li></List>
+- `cy.reload()` yields the `window` object after the page finishes loading.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the yielded `window` after
+  `cy.reload()`.
 
 ## Examples
 
diff --git a/content/api/commands/rightclick.md b/content/api/commands/rightclick.md
index b33aa6712f..a73465b973 100644
--- a/content/api/commands/rightclick.md
+++ b/content/api/commands/rightclick.md
@@ -4,6 +4,9 @@ title: rightclick
 
 Right click a DOM element.
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.rightclick()`.
+
 <Alert type="warning">
 
 `.rightclick()` will not open context menus native to the browser.
@@ -78,8 +81,9 @@ Pass in an options object to change the default behavior of `.rightclick()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.rightclick()` yields the same subject it was given from the previous
-command.</li></List>
+- `.rightclick()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.rightclick()`.
 
 ## Examples
 
diff --git a/content/api/commands/root.md b/content/api/commands/root.md
index 9ae9766025..1ae659227d 100644
--- a/content/api/commands/root.md
+++ b/content/api/commands/root.md
@@ -35,12 +35,14 @@ Pass in an options object to change the default behavior of `.root()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-`.root()` yields the root DOM element.
+`cy.root()` yields the root DOM element.
 
 The root element yielded is `<html>` by default. However, when calling `.root()`
 from a [`.within()`](/api/commands/within) command, the root element will point
 to the element you are "within".
 
+`cy.root()` is a query, and it is _safe_ to chain further commands.
+
 ## Examples
 
 ### HTML
diff --git a/content/api/commands/screenshot.md b/content/api/commands/screenshot.md
index fe76729b5b..fb95735a0b 100644
--- a/content/api/commands/screenshot.md
+++ b/content/api/commands/screenshot.md
@@ -64,8 +64,9 @@ For more details on these options and to set some as defaults across all uses of
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.screenshot()` yields the same subject it was given from the previous
-command.</li></List>
+- `.screenshot()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.screenshot()`.
 
 ## Examples
 
diff --git a/content/api/commands/scrollintoview.md b/content/api/commands/scrollintoview.md
index 68b1243196..ef96765ef1 100644
--- a/content/api/commands/scrollintoview.md
+++ b/content/api/commands/scrollintoview.md
@@ -4,6 +4,9 @@ title: scrollIntoView
 
 Scroll an element into view.
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.scrollIntoView()`.
+
 ## Syntax
 
 ```javascript
@@ -42,8 +45,9 @@ Pass in an options object to change the default behavior of `.scrollIntoView()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.scrollIntoView()` yields the same subject it was given from the
-previous command.</li></List>
+- `.scrollIntoView()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.scrollIntoView()`.
 
 ## Examples
 
diff --git a/content/api/commands/scrollto.md b/content/api/commands/scrollto.md
index 6b189a715b..39e716d50c 100644
--- a/content/api/commands/scrollto.md
+++ b/content/api/commands/scrollto.md
@@ -4,6 +4,9 @@ title: scrollTo
 
 Scroll to a specific position.
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.scrollTo()`.
+
 ## Syntax
 
 ```javascript
@@ -69,8 +72,9 @@ Pass in an options object to change the default behavior of `cy.scrollTo()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`cy.scrollTo()` yields the same subject it was given from the previous
-command.</li></List>
+- `.scrollTo()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.scrollTo()`.
 
 ## Examples
 
diff --git a/content/api/commands/select.md b/content/api/commands/select.md
index d33cb40dfe..6b2f9efadb 100644
--- a/content/api/commands/select.md
+++ b/content/api/commands/select.md
@@ -4,6 +4,9 @@ title: select
 
 Select an `<option>` within a `<select>`.
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.select()`.
+
 ## Syntax
 
 ```javascript
@@ -51,8 +54,9 @@ Pass in an options object to change the default behavior of `.select()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.select()` yields the same subject it was given from the previous
-command.</li></List>
+- `.select()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.select()`.
 
 ## Examples
 
diff --git a/content/api/commands/selectfile.md b/content/api/commands/selectfile.md
index d6eb28ee72..f1a19329ac 100644
--- a/content/api/commands/selectfile.md
+++ b/content/api/commands/selectfile.md
@@ -5,6 +5,9 @@ title: selectFile
 Selects a file or files in an HTML5 input element or simulates dragging a file
 or files into the browser.
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.selectFile()`.
+
 ## Syntax
 
 ```javascript
@@ -88,8 +91,9 @@ Pass in an options object to change the default behavior of `.selectFile()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-- `.selectFile()` yields the same subject it was given from the previous
-  command.
+- `.selectFile()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.selectFile()`.
 
 ### Action
 
diff --git a/content/api/commands/shadow.md b/content/api/commands/shadow.md
index 2562d20654..6fcaba5339 100644
--- a/content/api/commands/shadow.md
+++ b/content/api/commands/shadow.md
@@ -29,7 +29,8 @@ cy.get('.not-a-shadow-host').shadow() // Errors, subject must host a shadow root
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.shadow()` yields the new DOM element(s) it found.</li></List>
+- `.shadow()` yields the new DOM element(s) it found.
+- `.shadow()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/should.md b/content/api/commands/should.md
index 764e63a96f..97ac993e24 100644
--- a/content/api/commands/should.md
+++ b/content/api/commands/should.md
@@ -66,8 +66,8 @@ Whatever was passed to the function is what is yielded.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>In most cases, `.should()` yields the same subject it was given from
-the previous command.</li></List>
+In most cases, `.should()` yields the same subject it was given from the
+previous command.
 
 ```javascript
 cy.get('nav') // yields <nav>
@@ -85,6 +85,9 @@ cy.get('nav') // yields <nav>
   .and('match', /serif/) // yields 'sans-serif'
 ```
 
+`.should()` is an assertion, and it is _safe_ to chain further commands that use
+the subject.
+
 ## Examples
 
 ### Chainers
diff --git a/content/api/commands/siblings.md b/content/api/commands/siblings.md
index 72eef163c2..611ce319c1 100644
--- a/content/api/commands/siblings.md
+++ b/content/api/commands/siblings.md
@@ -46,7 +46,8 @@ Pass in an options object to change the default behavior of `.siblings()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.siblings()` yields the new DOM element(s) it found.</li></List>
+- `.siblings()` yields the new DOM element(s) it found.
+- `.siblings()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/spread.md b/content/api/commands/spread.md
index a40d739760..654ee3c7cd 100644
--- a/content/api/commands/spread.md
+++ b/content/api/commands/spread.md
@@ -49,10 +49,11 @@ Pass in an options object to change the default behavior of `.spread()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.spread()` 'yields the return value of your callback function'
-
-</li><li>`.spread()` wll not change the subject if `null` or `undefined` is
-returned.</li></List>
+- `.spread()` yields the return value of your callback function.
+- `.spread()` wlll not change the subject if `null` or `undefined` is returned.
+- If the returned values are DOM elements, it is
+  [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+  chain further commands that rely on the subject after `.spread()`.
 
 ## Examples
 
diff --git a/content/api/commands/spy.md b/content/api/commands/spy.md
index c5562c316a..462d88f856 100644
--- a/content/api/commands/spy.md
+++ b/content/api/commands/spy.md
@@ -5,6 +5,9 @@ title: spy
 Wrap a method in a spy in order to record calls to and arguments of the
 function.
 
+`cy.spy()` is a utility function, and is not a Cypress command, query or
+assertion. It is not retryable, chainable, or timeout-able.
+
 <Alert type="info">
 
 **Note:** `.spy()` assumes you are already familiar with our guide:
@@ -24,6 +27,7 @@ cy.spy(object, method)
 
 ```javascript
 cy.spy(user, 'addFriend')
+cy.spy(user, 'addFriend').as('addFriend')
 ```
 
 ### Arguments
@@ -38,11 +42,11 @@ The name of the `method` on the `object` to be wrapped.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-Unlike most Cypress commands, `cy.spy()` is _synchronous_ and returns a value
-(the spy) instead of a Promise-like chain-able object.
-
-`cy.spy()` returns a [Sinon.js spy](https://sinonjs.org/releases/v6.1.5/spies/).
-All methods found on Sinon.JS spies are supported.
+- `cy.spy()` is _synchronous_ and returns a value (the spy) instead of a
+  Promise-like chain-able object. It can be aliased.
+- `cy.spy()` returns a
+  [Sinon.js spy](https://sinonjs.org/releases/v6.1.5/spies/). All methods found
+  on Sinon.JS spies are supported.
 
 ## Examples
 
@@ -80,8 +84,9 @@ const stub = cy.stub(obj, 'foo').log(false)
 
 ### Aliases
 
-Adding an alias using [`.as()`](/api/commands/as) to spies makes them easier to
-identify in error messages and Cypress' command log.
+You can alias spies, similar to how [`.as()`](/api/commands/as) works. This can
+make your spies easier to identify in error messages and Cypress's command log,
+and allows you to assert against them later using `cy.get()`.
 
 ```javascript
 const obj = {
@@ -91,8 +96,9 @@ const spy = cy.spy(obj, 'foo').as('anyArgs')
 const withFoo = spy.withArgs('foo').as('withFoo')
 
 obj.foo()
+
 expect(spy).to.be.called
-expect(withFoo).to.be.called // purposefully failing assertion
+cy.get('@withFoo').should('be.called') // purposefully failing assertion
 ```
 
 You will see the following in the command log:
@@ -129,20 +135,6 @@ Cypress has also built-in
 [assertions supported by `Sinon-Chai`](/guides/references/assertions#Sinon-Chai)
 can be used without any configuration.
 
-## Rules
-
-### Requirements [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Chains-of-Commands)
-
-<List><li>`cy.spy()` requires being chained off of `cy`.</li></List>
-
-### Assertions [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Assertions)
-
-<List><li>`cy.spy()` cannot have any assertions chained.</li></List>
-
-### Timeouts [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Timeouts)
-
-<List><li>`cy.spy()` cannot time out.</li></List>
-
 ## Command Log
 
 **_Create a spy, alias it, and call it_**
diff --git a/content/api/commands/stub.md b/content/api/commands/stub.md
index 79e16a6bdd..9008855187 100644
--- a/content/api/commands/stub.md
+++ b/content/api/commands/stub.md
@@ -4,6 +4,9 @@ title: stub
 
 Replace a function, record its usage and control its behavior.
 
+`cy.stub()` is a utility function, and is not a Cypress command, query or
+assertion. It is not retryable, chainable, or timeout-able.
+
 <Alert type="info">
 
 **Note:** `.stub()` assumes you are already familiar with our guide:
@@ -25,6 +28,7 @@ cy.stub(object, method, replacerFn)
 
 ```javascript
 cy.stub(user, 'addFriend')
+cy.stub(user, 'addFriend').as('addFriend')
 ```
 
 ### Arguments
@@ -43,11 +47,10 @@ The function used to replace the `method` on the `object`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-Unlike most Cypress commands, `cy.stub()` is _synchronous_ and returns a value
-(the stub) instead of a Promise-like chain-able object.
-
-`cy.stub()` returns a [Sinon.js stub](http://sinonjs.org). All methods found on
-[Sinon.js](http://sinonjs.org) spies and stubs are supported.
+- `cy.stub()` is _synchronous_ and returns a value (the stub) instead of a
+  Promise-like chain-able object. It can be aliased.
+- `cy.stub()` returns a [Sinon.js stub](http://sinonjs.org). All methods found
+  on [Sinon.js](http://sinonjs.org) spies and stubs are supported.
 
 ## Examples
 
@@ -163,8 +166,9 @@ const stub = cy.stub(obj, 'foo').log(false)
 
 ### Aliases
 
-Adding an alias using [`.as()`](/api/commands/as) to stubs makes them easier to
-identify in error messages and Cypress's command log.
+You can alias stubs, similar to how [`.as()`](/api/commands/as) works. This can
+make your stubs easier to identify in error messages and Cypress's command log,
+and allows you to assert against them later using `cy.get()`.
 
 ```javascript
 const obj = {
@@ -174,8 +178,9 @@ const stub = cy.stub(obj, 'foo').as('anyArgs')
 const withFoo = stub.withArgs('foo').as('withFoo')
 
 obj.foo()
+
 expect(stub).to.be.called
-expect(withFoo).to.be.called // purposefully failing assertion
+cy.get('@withFoo').should('be.called') // purposefully failing assertion
 ```
 
 You will see the following in the command log:
@@ -203,20 +208,6 @@ invocations are recorded, the original method is still called. This can be very
 useful when testing methods on native browser objects. You can verify a method
 is being called by your test and still have the original method action invoked.
 
-## Rules
-
-### Requirements [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Chains-of-Commands)
-
-<List><li>`cy.stub()` requires being chained off of `cy`.</li></List>
-
-### Assertions [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Assertions)
-
-<List><li>`cy.stub()` cannot have any assertions chained.</li></List>
-
-### Timeouts [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Timeouts)
-
-<List><li>`cy.stub()` cannot time out.</li></List>
-
 ## Command Log
 
 **_Create a stub, alias it, and call it_**
diff --git a/content/api/commands/submit.md b/content/api/commands/submit.md
index ee0695da2c..e1f0a56e0e 100644
--- a/content/api/commands/submit.md
+++ b/content/api/commands/submit.md
@@ -4,6 +4,9 @@ title: submit
 
 Submit a form.
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.submit()`.
+
 <Alert type="warning">
 
 The [subject](/guides/core-concepts/introduction-to-cypress#Subject-Management)
@@ -46,8 +49,9 @@ Pass in an options object to change the default behavior of `.submit()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.submit()` yields the same subject it was given from the previous
-command.</li></List>
+- `.submit()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.submit()`.
 
 ## Example
 
diff --git a/content/api/commands/then.md b/content/api/commands/then.md
index f5c66805aa..8859242986 100644
--- a/content/api/commands/then.md
+++ b/content/api/commands/then.md
@@ -51,20 +51,26 @@ Pass a function that takes the previously yielded subject as its first argument.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-`.then()` is modeled identically to the way Promises work in JavaScript.
 Whatever is returned from the callback function becomes the new subject and will
-flow into the next command (with the exception of `undefined`).
-
-Additionally, the result of the last Cypress command in the callback function
-will be yielded as the new subject and flow into the next command if there is no
-`return`.
-
-When `undefined` is returned by the callback function, the subject will not be
-modified and will instead carry over to the next command.
-
-Just like Promises, you can return any compatible "thenable" (anything that has
-a `.then()` interface) and Cypress will wait for that to resolve before
-continuing forward through the chain of commands.
+flow into the next command (with the exception of `undefined` or `null`).
+
+- If the return value is a chain of Cypress commands (eg
+  `return cy.get('button')`), Cypress will wait for them to resolve and use
+  their return value as the new subject.
+- If the return value is a Promise, Cypress will wait for it to resolve, and use
+  the resolved value as the new subject to continue the chain of commands.
+- If the callback returns `undefined` or `null` (or there is no return value),
+  the result of the last Cypress command in the callback function will be
+  yielded as the new subject instead, and flow into the next command.
+- If the callback returns `undefined` or `null` (or there is no return value)
+  and the callback does not call any Cypress commands, the subject will not be
+  modified, and the previous subject will carry over to the next command.
+
+The callback function of `.then()` is not retried. It is
+[unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to return
+DOM elements directly from the callback and then use further commands on them.
+Instead, use Cypress queries to locate the elements you're interested in acting
+or asserting on.
 
 ## Examples
 
diff --git a/content/api/commands/title.md b/content/api/commands/title.md
index 922322b8c1..6faae418b3 100644
--- a/content/api/commands/title.md
+++ b/content/api/commands/title.md
@@ -32,8 +32,8 @@ Pass in an options object to change the default behavior of `cy.title()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`cy.title()` 'yields the `document.title` property of the current
-page' </li></List>
+- `cy.title()` 'yields the `document.title` property of the current page.
+- `cy.title()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/trigger.md b/content/api/commands/trigger.md
index 79d0097463..889c486595 100644
--- a/content/api/commands/trigger.md
+++ b/content/api/commands/trigger.md
@@ -4,6 +4,9 @@ title: trigger
 
 Trigger an event on a DOM element.
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.trigger()`.
+
 ## Syntax
 
 ```javascript
@@ -74,8 +77,9 @@ they will be attached to the event. Passing in coordinate arguments (`clientX`,
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.trigger()` yields the same subject it was given from the previous
-command.</li></List>
+- `.trigger()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.trigger()`.
 
 ## Examples
 
diff --git a/content/api/commands/type.md b/content/api/commands/type.md
index ef28f4a5dc..c11c0f8d23 100644
--- a/content/api/commands/type.md
+++ b/content/api/commands/type.md
@@ -4,6 +4,9 @@ title: type
 
 Type into a DOM element.
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.type()`.
+
 ## Syntax
 
 ```javascript
@@ -93,8 +96,9 @@ Pass in an options object to change the default behavior of `.type()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.type()` yields the same subject it was given from the previous
-command.</li></List>
+- `.type()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.type()`.
 
 ## Examples
 
diff --git a/content/api/commands/uncheck.md b/content/api/commands/uncheck.md
index f55dd8bc72..4f018935ee 100644
--- a/content/api/commands/uncheck.md
+++ b/content/api/commands/uncheck.md
@@ -4,6 +4,9 @@ title: uncheck
 
 Uncheck checkbox(es).
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.uncheck()`.
+
 ## Syntax
 
 ```javascript
@@ -55,8 +58,9 @@ Pass in an options object to change the default behavior of `.uncheck()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.uncheck()` yields the same subject it was given from the previous
-command.</li></List>
+- `.uncheck()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.uncheck()`.
 
 ## Examples
 
diff --git a/content/api/commands/url.md b/content/api/commands/url.md
index 35dbdaff50..94c3c35f98 100644
--- a/content/api/commands/url.md
+++ b/content/api/commands/url.md
@@ -42,7 +42,8 @@ Pass in an options object to change the default behavior of `cy.url()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`cy.url()` 'yields the current URL as a string' </li></List>
+- `cy.url()` yields the current URL as a string.
+- `cy.url()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/viewport.md b/content/api/commands/viewport.md
index 9e4481fea1..84c7fa30e8 100644
--- a/content/api/commands/viewport.md
+++ b/content/api/commands/viewport.md
@@ -80,8 +80,7 @@ Pass in an options object to change the default behavior of `cy.viewport()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`cy.viewport()` yields `null`.</li><li>`cy.viewport()` cannot be
-chained further.</li></List>
+- `cy.viewport()` yields `null`.
 
 ## Examples
 
diff --git a/content/api/commands/visit.md b/content/api/commands/visit.md
index 201b740a9e..19c60c09c7 100644
--- a/content/api/commands/visit.md
+++ b/content/api/commands/visit.md
@@ -84,8 +84,10 @@ globally in the [Cypress configuration](/guides/references/configuration).
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`cy.visit()` yields the `window` object after the page finishes
-loading</li></List>
+- `cy.visit()` yields the `window` object after the page finishes loading.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the yielded `window` after
+  `cy.visit()`.
 
 Let's confirm the `window.navigator.language` after visiting the site:
 
diff --git a/content/api/commands/wait.md b/content/api/commands/wait.md
index 9e60fafd16..eb3351f452 100644
--- a/content/api/commands/wait.md
+++ b/content/api/commands/wait.md
@@ -64,13 +64,14 @@ Pass in an options object to change the default behavior of `cy.wait()`.
 
 #### When given a `time` argument:
 
-<List><li>`cy.wait()` yields the same subject it was given from the previous
-command.</li></List>
+- `cy.wait()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.wait()`.
 
 #### When given an `alias` argument:
 
-<List><li>`cy.wait()` 'yields an object containing the HTTP request and response
-properties of the request' </li></List>
+- `cy.wait()` 'yields an object containing the HTTP request and response
+  properties of the request.
 
 ## Examples
 
diff --git a/content/api/commands/window.md b/content/api/commands/window.md
index 856bfe5081..92e11696b4 100644
--- a/content/api/commands/window.md
+++ b/content/api/commands/window.md
@@ -32,7 +32,8 @@ Pass in an options object to change the default behavior of `cy.window()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`cy.window()` 'yields the `window` object' </li></List>
+- `cy.window()` yields the `window` object.
+- `cy.window()` is a query, and it is _safe_ to chain further commands.
 
 ## Examples
 
diff --git a/content/api/commands/within.md b/content/api/commands/within.md
index e6ec706bef..c73be241e1 100644
--- a/content/api/commands/within.md
+++ b/content/api/commands/within.md
@@ -5,6 +5,9 @@ title: within
 Scopes all subsequent cy commands to within this element. Useful when working
 within a particular group of elements such as a `<form>`.
 
+It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried) to
+chain further commands that rely on the subject after `.within()`.
+
 ## Syntax
 
 ```javascript
@@ -43,8 +46,9 @@ Pass in an options object to change the default behavior of `.within()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`.within()` yields the same subject it was given from the previous
-command.</li></List>
+- `.within()` yields the same subject it was given.
+- It is [unsafe](/guides/core-concepts/retry-ability#Only-queries-are-retried)
+  to chain further commands that rely on the subject after `.within()`.
 
 Trying to return a different element the `.within` callback have no effect:
 
diff --git a/content/api/commands/wrap.md b/content/api/commands/wrap.md
index dccc9e1144..3ae590b22c 100644
--- a/content/api/commands/wrap.md
+++ b/content/api/commands/wrap.md
@@ -37,7 +37,7 @@ Pass in an options object to change the default behavior of `cy.wrap()`.
 
 ### Yields [<Icon name="question-circle"/>](/guides/core-concepts/introduction-to-cypress#Subject-Management)
 
-<List><li>`cy.wrap()` 'yields the object it was called with' </li></List>
+- `cy.wrap()` yields the object it was called with.
 
 ## Examples
 
diff --git a/content/api/cypress-api/custom-commands.md b/content/api/cypress-api/custom-commands.md
index 8d731584d4..da67612a32 100644
--- a/content/api/cypress-api/custom-commands.md
+++ b/content/api/cypress-api/custom-commands.md
@@ -8,9 +8,18 @@ defined below.
 
 <Alert type="info">
 
-A great place to define or overwrite commands is in your
-`cypress/support/commands.js` file, since it is loaded before any test files are
-evaluated via an import statement in the
+If you want your method to have builtin
+[retry-ability](/guides/core-concepts/retrysability), and especially if you
+return a DOM element for further commands to act on, consider writing a
+[custom query](/api/cypress-api/custom-queries) instead.
+
+</Alert>
+
+<Alert type="info">
+
+We recommend defining queries is in your `cypress/support/commands.js` file,
+since it is loaded before any test files are evaluated via an import statement
+in the
 [supportFile](/guides/core-concepts/writing-and-organizing-tests#Support-file).
 
 </Alert>
@@ -91,7 +100,6 @@ ignore previously yielded subjects.
 Examples of parent commands:
 
 - [`cy.visit()`](/api/commands/visit)
-- [`cy.get()`](/api/commands/get)
 - [`cy.request()`](/api/commands/request)
 - [`cy.exec()`](/api/commands/exec)
 - [`cy.intercept()`](/api/commands/intercept)
@@ -302,10 +310,8 @@ The previous subject will automatically be yielded to the callback function.
 Examples of child commands:
 
 - [`.click()`](/api/commands/click)
+- [`.submit()`](/api/commands/submit)
 - [`.trigger()`](/api/commands/trigger)
-- [`.find()`](/api/commands/find)
-- [`.should()`](/api/commands/should)
-- [`.as()`](/api/commands/as)
 
 #### Custom `console` command
 
@@ -374,7 +380,6 @@ with an existing subject or without one.
 
 Examples of dual commands:
 
-- [`cy.contains()`](/api/commands/contains)
 - [`cy.screenshot()`](/api/commands/screenshot)
 - [`cy.scrollTo()`](/api/commands/scrollto)
 - [`cy.wait()`](/api/commands/wait)
@@ -411,6 +416,15 @@ You can also modify the behavior of existing Cypress commands. This is useful to
 always set some defaults to avoid creating another command that ends up using
 the original.
 
+<Alert type="warning">
+
+`Cypress.Commands.overwrite` can only overwrite commands, not queries. If you
+want to modify the behavior of a query, you'll need to add your updated version
+under a new name using
+[`Cypress.Commands.addQuery`](/api/cypress-api/custom-queries) instead.
+
+</Alert>
+
 #### Overwrite `visit` command
 
 ```javascript
@@ -527,25 +541,17 @@ Cypress.Commands.overwrite(
 )
 ```
 
-#### Overwrite `contains` command
+#### Overwrite `click` command
 
-This example overwrites [.contains()](/api/commands/contains) to always have the
-`matchCase` option set to `false`.
+This example overwrites [.click()](/api/commands/click) to always have the
+`waitForAnimations` option set to `false`.
 
 ```js
 Cypress.Commands.overwrite(
-  'contains',
-  (originalFn, subject, filter, text, options = {}) => {
-    // determine if a filter argument was passed
-    if (typeof text === 'object') {
-      options = text
-      text = filter
-      filter = undefined
-    }
-
-    options.matchCase = false
-
-    return originalFn(subject, filter, text, options)
+  'click',
+  (originalFn, subject, positionOrX, y, options = {}) => {
+    options.waitForAnimations = false
+    return originalFn(subject, positionOrX, y, options)
   }
 )
 ```
@@ -642,20 +648,19 @@ Validations always work as "or" not "and".
 You can also mix optional commands **with** validations.
 
 ```javascript
-// this is how .contains() is implemented
+// this is how .scrollTo() is implemented
 Cypress.Commands.add(
-  'contains',
+  'scrollTo',
   {
-    prevSubject: ['optional', 'window', 'document', 'element'],
+    prevSubject: ['optional', 'element', 'window'],
   },
-  (subject, options) => {
+  (subject, ...args) => {
     // subject could be undefined
     // since it's optional.
     //
-    // if it's present
-    // then it's window, document, or element.
-    // - when window or document we'll query the entire DOM.
-    // - when element we'll query only inside of its children.
+    // if it's present then it's and element or window.
+    // - when window, we'll scroll to a position on the page.
+    // - when element, we'll scroll to a position related to the element.
     if (subject) {
       // ...
     } else {
@@ -668,17 +673,16 @@ Cypress.Commands.add(
 **<Icon name="check-circle" color="green"></Icon> Valid Usage**
 
 ```javascript
-cy.contains() // no subject, but valid because it's optional
-cy.get('#main').contains() // has subject, and is `element`
-cy.window().contains() // has subject, and is `window`
-cy.document().contains() // has subject, and is `document`
-cy.visit().contains() // has subject, and since visit yields `window` it's ok
+cy.scrollTo() // no subject, but valid because it's optional
+cy.get('#main').scrollTo() // has subject, and is `element`
+cy.visit().scrollTo() // has subject, and since visit yields `window` it's ok
 ```
 
 **<Icon name="exclamation-triangle" color="red"></Icon> Invalid Usage**
 
 ```javascript
-cy.wrap(null).contains() // has subject, but not `element`, will error
+cy.document().scrollTo() // has subject, but it's a `document`, will error
+cy.wrap(null).scrollTo() // has subject, but it's `null`, will error
 ```
 
 ## Notes
@@ -811,9 +815,9 @@ it('paginates many search results', () => {
 
 #### 2. Don't overcomplicate things
 
-Every custom command you write is generally an abstraction over a series of
-internal commands. That means you and your team members exert much more mental
-effort to understand what your custom command does.
+Custom commands you write are generally an abstraction over a series of internal
+commands. That means you and your team members exert much more mental effort to
+understand what your custom command does.
 
 There's no reason to add this level of complexity when you're only wrapping a
 couple commands.
diff --git a/content/api/cypress-api/custom-queries.md b/content/api/cypress-api/custom-queries.md
new file mode 100644
index 0000000000..ad71018888
--- /dev/null
+++ b/content/api/cypress-api/custom-queries.md
@@ -0,0 +1,392 @@
+---
+title: Custom Queries
+---
+
+Starting in Cypress 12, Cypress comes with its own API for creating custom
+queries. The built in Cypress queries use the very same API that's explained
+below.
+
+Queries are a type of command, used for _querying_ the state of your
+application. They are different from other commands in that they follow three
+important rules:
+
+1. Queries are _synchronous._ They do not return or await promises.
+2. Queries are _retriable._ Once you return the inner function, Cypress takes
+   control, handling retries on your behalf.
+3. Queries are _idempotent._ Once you return the inner function, Cypress will
+   invoke it repeatedly. Invoking the inner function multiple times must not
+   change the state of your application.
+
+With these rules, queries are simple to write and extremely powerful. They are
+the building blocks on which Cypress' API is built. To learn more about the
+differences between commands and queries, see our
+[guide on Retry-ability](/guides/core-concepts/retry-ability#Only-queries-are-retried).
+
+<Alert type="info">
+
+If you want to chain together existing Cypress commands as a shortcut, you
+probably want to write a [custom command](/api/cypress-api/custom-command)
+instead.
+
+You'll also want to write a command instead of a query if your method needs to
+be asynchronous, or it shouldn't be called more than once.
+
+</Alert>
+
+<Alert type="info">
+
+We recommend defining queries in your `cypress/support/commands.js` file, since
+it is loaded before any test files are evaluated via an import statement in the
+[supportFile](/guides/core-concepts/writing-and-organizing-tests#Support-file).
+
+</Alert>
+
+## Syntax
+
+```javascript
+Cypress.Commands.addQuery(name, callbackFn)
+```
+
+### Usage
+
+**<Icon name="check-circle" color="green"></Icon> Correct Usage**
+
+```javascript
+Cypress.Commands.addQuery('getById', function (id) {
+  return (subject) => newSubject
+})
+```
+
+### Arguments
+
+**<Icon name="angle-right"></Icon> name** **_(String)_**
+
+The name of the query you're adding.
+
+**<Icon name="angle-right"></Icon> callbackFn** **_(Function)_**
+
+Pass a function that receives the arguments passed to the query.
+
+This outer function is invoked once. It should return a function that takes a
+subject and returns a new subject; this inner function might be called multiple
+times.
+
+## Examples
+
+### `.focused()`
+
+The callback function can be thought of as two separate parts. The _outer
+function_, which is invoked once, where you perform setup and state management,
+and the _query function_, which might be called repeatedly.
+
+Let's look at an example. This is actual Cypress code - how `.focused()` is
+implemented internally. The only thing omitted here for simplicity is the
+TypeScript definitions.
+
+```javascript
+Commands.addQuery('focused', function focused(options = {}) {
+  const log = options.log !== false && Cypress.log({ timeout: options.timeout })
+
+  this.set('timeout', options.timeout)
+
+  return () => {
+    let $el = cy.getFocused()
+
+    log &&
+      cy.state('current') === this &&
+      log.set({
+        $el,
+        consoleProps: () => {
+          return {
+            Yielded: $el?.length ? $dom.getElements($el) : '--nothing--',
+            Elements: $el != null ? $el.length : 0,
+          }
+        },
+      })
+
+    if (!$el) {
+      $el = $dom.wrap(null)
+      $el.selector = 'focused'
+    }
+
+    return $el
+  }
+})
+```
+
+#### The outer function
+
+The outer function is called once each time test uses the query. It performs
+setup and state management:
+
+```javascript
+function focused(options = {}) {
+  const log = options.log !== false && Cypress.log({ timeout: options.timeout })
+
+  this.set('timeout', options.timeout)
+
+  return () => { ... } // Inner function
+}
+```
+
+Let's look at this piece by piece.
+
+```javascript
+function focused(options = {}) { ... }
+```
+
+Cypress passes the outer function whatever arguments the user calls it with; no
+processing or validation is done on the user's arguments. In our case,
+`.focused()` accepts one optional argument, `options`.
+
+If you wanted to validate the incoming arguments, you might add something like:
+
+```javascript
+if (options === null || !_.isPlainObject(options)) {
+  const err = `cy.root() requires an \`options\` object. You passed in: \`{options}\``
+  throw new TypeError(err)
+}
+```
+
+This is a general pattern: when something goes wrong, queries just throw an
+error. Cypress will handle displaying the error in the Command Log.
+
+```javascript
+const log = options.log !== false && Cypress.log({ timeout: options.timeout })
+```
+
+If the user has not set `{ log: false }`, we create a new `Cypress.log()`
+instance. See [`Cypress.log()`](/api/cypress-api/cypress-log) for more
+information.
+
+This line is setup code, so it lives in the outer function - we only want it to
+run once, creating the log message when Cypress first begins executing this
+query. We hold onto a reference to `Log` instance. We'll update it later with
+additional details when the inner function executes.
+
+```javascript
+this.set('timeout', options.timeout)
+```
+
+When defining `focused()`, it's important to note that we used `function`,
+rather than an arrow function. This gives us access to `this`, where we can set
+the `timeout`. If you don't call `this.set('timeout')`, or call it with `null`
+or `undefined`, your query will use the
+[default timeout](/guides/core-concepts/introduction-to-cypress#Timeouts).
+
+```
+  return () => { ... }
+```
+
+#### The inner function
+
+The outer function's return value is the inner function.
+
+The inner function is called any number of times. It's first invoked repeatedly
+until it passes or the query times out; it can then be invoked again later to
+determine the subject of future commands, or when the user retrieves an alias.
+
+The inner function is called with one argument: the previous subject. Cypress
+performs no validation on this - it could be any type, including `null` or
+`undefined`.
+
+`.focused()` ignores any previous subject, but many queries do not - for
+example, `.contains()` accepts only certain types of subjects. You can use
+Cypress' builtin `ensures` functions, as `.contains()` does:
+`cy.ensureSubjectByType(subject, ['optional', 'element', 'window', 'document'], this)`
+
+or you can perform your own validation and simply throw an error:
+`if (!_.isString(subject)) { throw new Error('MyCustomCommand only accepts strings as a subject!') }`
+
+If the inner function throws an error, Cypress will retry it after a short delay
+until it either passes or the query times out. This is the core of Cypress'
+retry-ability, and the guarantees it provides that your tests interact with the
+page as a user would.
+
+Looking back to our `.focused()` example:
+
+```javascript
+return () => {
+  let $el = cy.getFocused()
+
+  log &&
+    cy.state('current') === this &&
+    log.set({
+      $el,
+      consoleProps: () => {
+        return {
+          Yielded: $el?.length ? $dom.getElements($el) : '--nothing--',
+          Elements: $el != null ? $el.length : 0,
+        }
+      },
+    })
+
+  if (!$el) {
+    $el = $dom.wrap(null)
+    $el.selector = 'focused'
+  }
+
+  return $el
+}
+```
+
+Piece by piece again:
+
+```javascript
+let $el = cy.getFocused()
+```
+
+This is the 'business end' of `.focused()` - finding the element on the page
+that's currently focused.
+
+```javascript
+    log && cy.state('current') === this && log.set({...})
+```
+
+If `log` is defined (ie, the user did not pass in `{ log: false }`), and this
+query is the current command, we update the log message with new information,
+such as `$el` (the subject we're about to yield from this query), and the
+`consoleProps`, a function that
+[returns console output](/guides/core-concepts/cypress-app#Console-output) for
+the user.
+
+```javascript
+if (!$el) {
+  $el = $dom.wrap(null)
+  $el.selector = 'focused'
+}
+```
+
+If there's no focused element on the page, we create an empty jquery object.
+
+```javascript
+return $el
+```
+
+The return value of the inner function becomes the new subject for the next
+command.
+
+With this return value in hand, Cypress verifies any upcoming assertions, such
+as user's `.should()` commands, or if there are none, the default implicit
+assertions that the subject should exist.
+
+### Using existing queries
+
+Many custom queries are wrappers around other, already implemented queries -
+most commonly `.get()`.
+
+This is quite simple:
+
+```javascript
+Cypress.Commands.addQuery('getFirstButton', function getFirstButton(options) {
+  const getFn = cy.now('get', 'button:first', options)
+
+  return (subject) => {
+    console.log('The subject we received was:', subject)
+
+    const btn = getFn(subject)
+
+    console.log('.get returned this element:', btn)
+
+    return btn
+  }
+})
+```
+
+Calling `cy.now()` on a query calls the outer function of that query, and
+returns the inner function. In our case, we call `get` with `button:first` and
+pass through whatever `options` the user provided us.
+
+In our own inner function, we can then call `getFn`, and do whatever we want
+with the return value.
+
+Remember that commands - including queries - don't have a meaningful return
+value. Calling `cy.get()` directly would just add it to the queue of commands to
+be executed later (which is not idempotent!). `cy.now()` lets us directly call
+the original `get` query function, without Cypress' chaining and command queue
+logic wrapped around it.
+
+## Validation
+
+As noted in the examples above, Cypress performs very little validation around
+queries - it is the repsonsibility of each implementation to ensure that its
+arguments and subject are of the correct type.
+
+Cypress has several builtin 'ensures' which can be helpful in this regard:
+
+- `cy.ensureSubjectByType(subject, types, this)`: Accepts an array with any of
+  the strings `optional`, `element`, `document`, or `window`.
+  `ensureSubjectByType` is how
+  [`prevSubject` validation](/api/cypress-api/custom-commands#Validations) is
+  implemented for commmands.
+- `cy.ensureElement(subject, queryName)`: Ensure that the passed in `subject` is
+  one or more DOM elements.
+- `cy.ensureWindow(subject)`: Ensure that the passed in `subject` is a
+  `document`.
+- `cy.ensureDocument(subject)`: Ensure that the passed in `subject` is a
+  `window`.
+
+- `cy.ensureAttached(subject, queryName)`: Ensure that DOM element(s) are
+  attached to the page.
+- `cy.ensureNotDisabled(subject)`: Ensure that form elements aren't disabled.
+- `cy.ensureVisibility(subject)`: Ensure that a DOM element is visible on the
+  page.
+
+There's nothing special about these functions - they simply validate their
+argument and throw an error if the check fails. You can throw errors of any type
+at any time inside your queries - Cypress will catch and handle it
+appropriately.
+
+## Notes
+
+### Best Practices
+
+#### 1. Don't make everything a custom query
+
+Custom queries work well when you're needing to describe behavior that's
+desirable across **all of your tests**. Examples would be `cy.findBreadcrumbs()`
+or `cy.getLoginForm()`. These are specific to your application and can be used
+everywhere.
+
+However, this pattern can be used and abused. Let's not forget - writing Cypress
+tests is **JavaScript**, and it's often more efficient to write a function for
+repeatable behavior than it is to implement a custom query.
+
+#### 2. Don't overcomplicate things
+
+Every custom query you write is generally an abstraction for locating elements
+on the page. That means you and your team members exert much more mental effort
+to understand what your custom command does.
+
+There's no reason to add this level of complexity when the builtin queries are
+already quite expressive and powerful.
+
+Don't do things like:
+
+- **<Icon name="exclamation-triangle" color="red"></Icon>** `cy.getButton()`
+- **<Icon name="exclamation-triangle" color="red"></Icon>**
+  `.getFirstTableRow()`
+
+Both of these are wrapping `cy.get(selector)`. It's completely unnecessary. Just
+call `.get('button')` or `.get('tr:first')`.
+
+Testing in Cypress is all about **readability** and **simplicity**. You don't
+have to do that much actual programming to get a lot done. You also don't need
+to worry about keeping your code as DRY as possible. Test code serves a
+different purpose than app code. Understandability and debuggability should be
+prioritized above all else.
+
+Try not to overcomplicate things and create too many abstractions.
+
+## History
+
+| Version                                       | Changes              |
+| --------------------------------------------- | -------------------- |
+| [12.0.0](/guides/references/changelog#12-0-0) | `addQuery` API added |
+
+## See also
+
+- See how to add
+  [TypeScript support for custom commands](/guides/tooling/typescript-support#Types-for-custom-commands)
+- [Plugins using custom commands](/plugins/directory#custom-commands)
+- [Cypress.log()](/api/cypress-api/cypress-log)
diff --git a/content/guides/core-concepts/conditional-testing.md b/content/guides/core-concepts/conditional-testing.md
index 615c1164b2..58c7d34d36 100644
--- a/content/guides/core-concepts/conditional-testing.md
+++ b/content/guides/core-concepts/conditional-testing.md
@@ -293,7 +293,8 @@ cy.getCookie('showWizard')
       cy.get('#wizard').contains('Close').click()
     }
   })
-  .get(...)    // more commands here
+
+cy.get(...)    // more commands here
   .should(...) // more commands here
   .click()     // more commands here
 ```
@@ -314,7 +315,8 @@ cy.request('https://app.com/me')
       cy.get('#wizard').contains('Close').click()
     }
   })
-  .get(...)    // more commands here
+
+cy.get(...)    // more commands here
   .should(...) // more commands here
   .click()     // more commands here
 ```
@@ -337,9 +339,10 @@ cy.get('html').should('have.attr', 'data-wizard').then((wizard) => {
     cy.get('#wizard').contains('Close').click()
   }
 })
-.get(...)    // more commands here
-.should(...) // more commands here
-.click()     // more commands here
+
+cy.get(...)    // more commands here
+  .should(...) // more commands here
+  .click()     // more commands here
 ```
 
 ### Element existence
diff --git a/content/guides/core-concepts/cypress-app.md b/content/guides/core-concepts/cypress-app.md
index e12b42407e..a70b22e76b 100644
--- a/content/guides/core-concepts/cypress-app.md
+++ b/content/guides/core-concepts/cypress-app.md
@@ -144,9 +144,8 @@ the Application or Component Under Test, and exploring its DOM.
 
 The left-hand side of the Test Runner is a visual representation of your test
 suite. Each test block is properly nested and each test, when clicked, displays
-every Cypress command and assertion executed within the test's block as well as
-any command or assertion executed in relevant `before`, `beforeEach`,
-`afterEach`, and `after` hooks.
+every Cypress command executed within the test's block as well as any commands
+executed in relevant `before`, `beforeEach`, `afterEach`, and `after` hooks.
 
 <DocsImage src="/img/guides/core-concepts/cypress-app/command-log.png" alt="Cypress app" width-600></DocsImage>
 
@@ -160,10 +159,9 @@ file where the code is located. Clicking on this link will open the file in your
 
 ### Time traveling
 
-Each command and assertion, when hovered over, restores the Application or
-Component Under Test (right-hand side) to the state it was in when that command
-executed. This allows you to **time travel** back to previous states when
-testing.
+Each command, when hovered over, restores the Application or Component Under
+Test (right-hand side) to the state it was in when that command executed. This
+allows you to **time travel** back to previous states when testing.
 
 <Alert type="info">
 
@@ -191,10 +189,10 @@ the URL that was present when the snapshot was taken.
 
 ### Pinning snapshots
 
-Each command, assertion, or error, when clicked on, displays extra information
-in the dev tools console. Clicking also **pins** the Application or Component
-Under Test (right-hand side) to its previous state, or **snapshot**, when the
-command executed.
+Each command, when clicked on, displays extra information in the dev tools
+console. Clicking also **pins** the Application or Component Under Test
+(right-hand side) to its previous state, or **snapshot**, when the command
+executed.
 
 In the following example, clicking on the `CLICK` command highlights it in
 purple, and does three other things worth noting:
@@ -520,7 +518,7 @@ debugging tools to help you understand a test. You can:
 
 ### Console output
 
-Besides Commands being interactive, they also output additional debugging
+Besides commands being interactive, they also output additional debugging
 information to your console.
 
 Open up your Dev Tools and click on the `GET` for the `.action-email` class
diff --git a/content/guides/core-concepts/interacting-with-elements.md b/content/guides/core-concepts/interacting-with-elements.md
index a490125045..76807c728b 100644
--- a/content/guides/core-concepts/interacting-with-elements.md
+++ b/content/guides/core-concepts/interacting-with-elements.md
@@ -28,16 +28,17 @@ Some commands in Cypress are for interacting with the DOM such as:
 - [`.trigger()`](/api/commands/trigger)
 - [`.selectFile()`](/api/commands/selectfile)
 
-These commands simulate a user interacting with your application. Under the
-hood, Cypress fires the events a browser would fire thus causing your
-application's event bindings to fire.
+We call these "action commands." These actions simulate a user interacting with
+your application. Under the hood, Cypress fires the events a browser would fire
+thus causing your application's event bindings to fire.
 
 Prior to issuing any of the commands, we check the current state of the DOM and
 take some actions to ensure the DOM element is "ready" to receive the action.
 
-Cypress will wait for the element to pass all of these checks for the duration
-of the [`defaultCommandTimeout`](/guides/references/configuration#Timeouts)
-(described in depth in the
+Cypress will watch the DOM - re-running the queries that yielded the current
+subject - until an element passes all of these checks for the duration of the
+[`defaultCommandTimeout`](/guides/references/configuration#Timeouts) (described
+in depth in the
 [Default Assertions](/guides/core-concepts/introduction-to-cypress#Default-Assertions)
 core concept guide).
 
@@ -102,12 +103,14 @@ Cypress checks whether an element's `disabled` property is `true`.
 
 ### Detached
 
-When many applications rerender the DOM, they actually remove the DOM element
-and insert a new DOM element in its place with the newly change attributes.
+Cypress checks whether an element you are making assertions on is still within
+the `document` of the application under test.
 
-Cypress checks whether an element you are making assertions is detached from the
-DOM. This checks that the element is still within the `document` of the
-application under test.
+When many applications rerender the DOM, they actually remove the DOM element
+and insert a new DOM element in its place with the newly change attributes. This
+is why it's important not to chain _action commands_ together - cypress can
+re-run queries to locate the fresh element, but it will
+[never re-run commands](/guides/core-concepts/retry-ability).
 
 ### Readonly
 
@@ -240,7 +243,7 @@ algorithms that we described above.
 
 In fact we only ever scroll elements into view when actionable commands are
 running using the above algorithms. We _do not_ scroll elements into view on
-regular DOM commands like [`cy.get()`](/api/commands/get) or
+regular DOM queries like [`cy.get()`](/api/commands/get) or
 [`.find()`](/api/commands/find).
 
 The reason we scroll an element into view when hovering over a snapshot is to
diff --git a/content/guides/core-concepts/introduction-to-cypress.md b/content/guides/core-concepts/introduction-to-cypress.md
index 3bca165728..09303f94d4 100644
--- a/content/guides/core-concepts/introduction-to-cypress.md
+++ b/content/guides/core-concepts/introduction-to-cypress.md
@@ -122,7 +122,7 @@ and exposes many of its DOM traversal methods to you so you can work with
 complex HTML structures with ease using APIs you're already familiar with.
 
 ```js
-// Each method is equivalent to its jQuery counterpart. Use what you know!
+// Each Cypress query is equivalent to its jQuery counterpart.
 cy.get('#main-content').find('.article').children('img[src^="/static"]').first()
 ```
 
@@ -330,17 +330,18 @@ understanding how they work is helpful!
 
 As we saw in the initial example, Cypress allows you to click on and type into
 elements on the page by using [`.click()`](/api/commands/click) and
-[`.type()`](/api/commands/type) commands with a [`cy.get()`](/api/commands/get)
-or [`cy.contains()`](/api/commands/contains) command. This is a great example of
-chaining in action. Let's see it again:
+[`.type()`](/api/commands/type) action commands with a
+[`cy.get()`](/api/commands/get) or [`cy.contains()`](/api/commands/contains)
+query command. This is a great example of chaining in action. Let's see it
+again:
 
 ```js
 cy.get('textarea.post-body').type('This is an excellent post.')
 ```
 
-We're chaining the [`.type()`](/api/commands/type) onto the
+We're chaining [`.type()`](/api/commands/type) onto
 [`cy.get()`](/api/commands/get), telling it to type into the subject yielded
-from the [`cy.get()`](/api/commands/get) command, which will be a DOM element.
+from the [`cy.get()`](/api/commands/get) query, which will be a DOM element.
 
 Here are even more action commands Cypress provides to interact with your app:
 
@@ -407,42 +408,44 @@ We will learn more about [assertions](#Assertions) later in this guide.
 A new Cypress chain always starts with `cy.[command]`, where what is yielded by
 the `command` establishes what other commands can be called next (chained).
 
-Some methods yield `null` and thus cannot be chained, such as
-[`cy.clearCookies()`](/api/commands/clearcookies).
+#### All commands yield a value.
+
+Each command specifies what value it yields. For example,
+
+- [`cy.clearCookies()`](/api/commands/clearcookies) yields `null`. You can chain
+  off commands that yield `null`, as long as the next command doesn't expect to
+  receive a subject.
+- [`cy.contains()`](/api/commands/contains) yields a DOM element, allowing
+  further commands to be chained (assuming they expect a DOM subject) like
+  [`.click()`](/api/commands/click) or even
+  [`cy.contains()`](/api/commands/contains) again.
+- [`.click()`](/api/commands/click) yields the same subject it was originally
+  given.
+
+#### Some commands require a previous subject.
+
+- [.click()](/api/commands/click) requires a DOM element from the previous
+  command.
+- [.its()](/api/commands/its) requires a subject, but it can be of any type.
+- [`cy.contains()`](/api/commands/contains) behaves differently depending on the
+  previous subject. If chained directly off of `cy`, or if the previous command
+  yielded `null`, it will look at the entire document. But if the subject is a
+  DOM element, it will only look inside that container.
+- [`cy.clearCookies()`](/api/commands/clearcookies) does not require a previous
+  subject - it can be chained off of anything, even
+  [`.end()`](/api/commands/end).
 
-Some methods, such as [`cy.get()`](/api/commands/get) or
-[`cy.contains()`](/api/commands/contains), yield a DOM element, allowing further
-commands to be chained onto them (assuming they expect a DOM subject) like
-[`.click()`](/api/commands/click) or even
-[`cy.contains()`](/api/commands/contains) again.
-
-#### Some commands can be chained from...
-
-- `cy` only, meaning they do not operate on a subject:
-  [`cy.clearCookies()`](/api/commands/clearcookies).
-- commands yielding particular kinds of subjects (like DOM elements):
-  [`.type()`](/api/commands/type).
-- both `cy` _and_ from a subject-yielding command:
-  [`cy.contains()`](/api/commands/contains).
-
-#### Some commands yield...
-
-- `null`, meaning no command can be chained after the command:
-  [`cy.clearCookie()`](/api/commands/clearcookie).
-- the same subject they were originally yielded:
-  [`.click()`](/api/commands/click).
-- a new subject, as appropriate for the command [`.wait()`](/api/commands/wait).
+#### Examples:
 
 This is actually much more intuitive than it sounds.
 
-#### Examples:
-
 ```js
-cy.clearCookies() // Done: 'null' was yielded, no chaining possible
+cy.clearCookies() // Yields null
+  .visit('/fixtures/dom.html') // Does not care about the previous subject.
 
 cy.get('.main-container') // Yields an array of matching DOM elements
   .contains('Headlines') // Yields the first DOM element containing content
-  .click() // Yields same DOM element from previous command
+  .click() // Yields same DOM element from previous command.
 ```
 
 <Alert type="success">
@@ -457,11 +460,26 @@ is in order.
 
 </Alert>
 
+<Alert type="warning">
+
+<strong class="alert-header">Don't continue a chain after acting on the
+DOM</strong>
+
+While it's possible in Cypress to act on the DOM and then continue chaining,
+this is usually unsafe, and can lead to stale elements. See the
+[Retry-ability Guide](/guides/core-concepts/retry-ability) for more details.
+
+But the rule of thumb is simple: If you perform an action, like navigating the
+page, clicking a button or scrolling the viewport, end the chain of commands
+there and start fresh from `cy`.
+
+</Alert>
+
 <Alert type="info">
 
 To work around the need to reference elements, Cypress has a feature
 [known as aliasing](/guides/core-concepts/variables-and-aliases). Aliasing helps
-you to **store** and **save** element references for future use.
+you to **store** and **save** references for future use.
 
 </Alert>
 
@@ -523,14 +541,13 @@ cy.get('.my-selector')
 
 /* many more actions */
 
-cy.get('@myElement') // re-queries the DOM as before (only if necessary)
+cy.get('@myElement') // re-queries the DOM as before
   .click()
 ```
 
-This lets us reuse our DOM queries for faster tests when the element is still in
-the DOM, and it automatically handles re-querying the DOM for us when it is not
-immediately found in the DOM. This is particularly helpful when dealing with
-front end frameworks that do a lot of re-rendering!
+This lets us reuse our queries for more readable tests, and it automatically
+handles re-querying the DOM for us as it updates. This is particularly helpful
+when dealing with front end frameworks that do a lot of re-rendering!
 
 ### Commands Are Asynchronous
 
@@ -550,6 +567,8 @@ it('hides the thing when it is clicked', () => {
   cy.get('.hides-when-clicked') // Still nothing happening
     .should('be.visible') // Still absolutely nothing
     .click() // Nope, nothing
+
+  cy.get('.hides-when-clicked') // Still nothing happening
     .should('not.be.visible') // Definitely nothing happening yet
 })
 
@@ -568,6 +587,8 @@ it('hides the thing when it is clicked', () => {
   cy.get('.hides-when-clicked') // Still nothing happening
     .should('be.visible') // Still absolutely nothing
     .click() // Nope, nothing
+
+  cy.get('.hides-when-clicked') // Still nothing happening
     .should('not.be.visible') // Definitely nothing happening yet
 })
 
@@ -579,8 +600,7 @@ it('hides the thing when it is clicked', () => {
 </template>
 </e2e-or-ct>
 
-Cypress doesn't kick off the browser automation magic until the test function
-exits.
+Cypress doesn't kick off the browser automation until the test function exits.
 
 #### Mixing Async and Sync code
 
@@ -723,7 +743,7 @@ it('test', () => {
 <strong class="alert-header">Core Concept</strong>
 
 Each Cypress command (and chain of commands) returns immediately, having only
-been appended to a queue of commands to be executed at a later time.
+been appended to a queue to be executed at a later time.
 
 You purposefully **cannot** do anything useful with the return value from a
 command. Commands are enqueued and managed entirely behind the scenes.
@@ -752,7 +772,7 @@ later in this guide.
 Using JavaScript loop commands like `while` can have unexpected effects. Let's
 say our application shows a random number on load.
 
-<DocsImage src="/img/guides/core-concepts/v10/reload-page.gif" alt="Manually reloading the browser page until the number 7 appears"></DocsImage>
+<DocsImage src="/img/guides/core-concepts/reload-page.gif" alt="Manually reloading the browser page until the number 7 appears"></DocsImage>
 
 We want the test to stop when it finds the number 7. If any other number is
 displayed the test reloads the page and checks again.
@@ -844,12 +864,14 @@ commands that were enqueued using the `cy.*` command chains.
 
 ```js
 it('hides the thing when it is clicked', () => {
-  cy.visit('/my/resource/path') // 1.
+  cy.visit('/my/resource/path') // 1
 
-  cy.get('.hides-when-clicked') // 2.
-    .should('be.visible') // 3.
-    .click() // 4.
-    .should('not.be.visible') // 5.
+  cy.get('.hides-when-clicked') // 2
+    .should('be.visible') // 3
+    .click() // 4
+
+  cy.get('.hides-when-clicked') // 5
+    .should('not.be.visible') // 6
 })
 ```
 
@@ -858,12 +880,14 @@ it('hides the thing when it is clicked', () => {
 
 ```js
 it('hides the thing when it is clicked', () => {
-  cy.mount(<MyComponent />) // 1.
+  cy.mount(<MyComponent />) // 1
+
+  cy.get('.hides-when-clicked') // 2
+    .should('be.visible') // 3
+    .click() // 4
 
-  cy.get('.hides-when-clicked') // 2.
-    .should('be.visible') // 3.
-    .click() // 4.
-    .should('not.be.visible') // 5.
+  cy.get('.hides-when-clicked') // 5
+    .should('not.be.visible') // 6
 })
 ```
 
@@ -876,7 +900,8 @@ The test above would cause an execution in this order:
 2. Find an element by its selector.
 3. Assert that the element is visible.
 4. Perform a click action on that element.
-5. Assert that the element is no longer visible.
+5. Find an element by its selector.
+6. Assert that the element is no longer visible.
 
 These actions will always happen serially (one after the other), never in
 parallel (at the same time). Why?
@@ -893,7 +918,9 @@ hidden **✨ magic ✨** Cypress does for us at each step:
    passes** ✨
 4. Perform a click action on that element ✨ **after we wait for the element to
    reach an actionable state** ✨
-5. Assert that the element is no longer visible ✨ **and retry until the
+5. Find an element by its selector ✨ **and retry until it is found in the DOM**
+   ✨
+6. Assert that the element is no longer visible ✨ **and retry until the
    assertion passes** ✨
 
 As you can see, Cypress does a lot of extra work to ensure the state of the
@@ -922,8 +949,8 @@ the timeout is reached, the test will fail.
 ### The Cypress Command Queue
 
 While the API may look similar to Promises, with it's `then()` syntax, Cypress
-commands are not promises - they are serial commands passed into a central
-queue, to be executed asynchronously at a later date. These commands are
+commands and queries are not promises - they are serial commands passed into a
+central queue, to be executed asynchronously at a later date. These commands are
 designed to deliver deterministic, repeatable and consistent tests.
 
 Almost all commands come with built-in
@@ -958,8 +985,8 @@ Let's take a look at each trade-off in depth:
 
 #### You cannot race or run multiple commands at the same time
 
-Cypress guarantees that it will execute all of its commands _deterministically_
-and identically every time they are run.
+Cypress guarantees that it will execute all of its commands and queries
+_deterministically_ and identically every time they are run.
 
 A lot of Cypress commands _mutate_ the state of the browser in some way.
 
@@ -980,7 +1007,7 @@ model after a real user working step by step.
 
 In Cypress there is no built in error recovery from a failed command. A command
 and its assertions all _eventually_ pass, or if one fails, all remaining
-commands are not run, and the test fails.
+commands are not executed, and the test fails.
 
 You might be wondering:
 
@@ -1021,8 +1048,8 @@ state.
 
 <strong class="alert-header">Core Concept</strong>
 
-Each API Command documents its behavior with assertions - such as how it retries
-or waits for assertions to pass.
+Each command documents its behavior with assertions - such as how it retries or
+waits for assertions to pass.
 
 </Alert>
 
@@ -1036,7 +1063,8 @@ Let's look at how you'd describe an assertion in English:
 To express this in Cypress you'd write:
 
 ```js
-cy.get('button').click().should('have.class', 'active')
+cy.get('button').click()
+cy.get('button').should('have.class', 'active')
 ```
 
 This above test will pass even if the `.active` class is applied to the button
@@ -1107,7 +1135,7 @@ fail! Here's a few:
 - The initial [`cy.mount()`](/api/commands/mount) or
   [`cy.visit()`](/api/commands/visit) could respond with something other than
   success.
-- Any of the [`cy.get()`](/api/commands/get) commands could fail to find their
+- Any of the [`cy.get()`](/api/commands/get) queries could fail to find their
   elements in the DOM.
 - The element we want to [`.click()`](/api/commands/click) on could be covered
   by another element.
@@ -1116,8 +1144,6 @@ fail! Here's a few:
 - The in-page JS (the application under test) or the component could throw an
   error.
 
-Can you think of any more?
-
 <Alert type="success">
 
 <strong class="alert-header">Core Concept</strong>
@@ -1134,7 +1160,7 @@ guarantee.
 
 ### Default Assertions
 
-Many commands have a default, built-in assertion, or rather have requirements
+Many commands have default, built-in assertions, or rather have requirements
 that may cause it to fail without needing an explicit assertion you've added.
 
 #### For instance:
@@ -1157,25 +1183,24 @@ that may cause it to fail without needing an explicit assertion you've added.
   current subject.
 
 Certain commands may have a specific requirement that causes them to immediately
-fail without retrying: such as [`cy.request()`](/api/commands/request).
+fail without retrying, such as [`cy.request()`](/api/commands/request).
 
-Others, such as DOM based commands will automatically
+Others, such as DOM queries automatically
 [retry](/guides/core-concepts/retry-ability) and wait for their corresponding
 elements to exist before failing.
 
-Even more - action commands will automatically wait for their element to reach
-an [actionable state](/guides/core-concepts/interacting-with-elements) before
+Action commands automatically wait for their element to reach an
+[actionable state](/guides/core-concepts/interacting-with-elements) before
 failing.
 
 <Alert type="success">
 
 <strong class="alert-header">Core Concept</strong>
 
-All DOM based commands automatically wait for their elements to exist in the
-DOM.
+All DOM commands automatically wait for their elements to exist in the DOM.
 
-You **never** need to write [`.should('exist')`](/api/commands/should) after a
-DOM based command.
+You **never** need to write [`.should('exist')`](/api/commands/should) after
+querying the DOM.
 
 </Alert>
 
@@ -1208,9 +1233,11 @@ All you have to do is add that assertion and Cypress will **reverse** its rules
 waiting for elements to exist.
 
 ```js
+cy.get('button.close').click()
+
 // now Cypress will wait until this
-// <button> is not in the DOM after the click
-cy.get('button.close').click().should('not.exist')
+// <button> is not in the DOM
+cy.get('button.close').should('not.exist')
 
 // and now make sure this #modal does not exist in the DOM
 // and automatically wait until it's gone!
@@ -1337,7 +1364,7 @@ Explicit assertions are great when you want to:
 - Perform custom logic prior to making the assertion.
 - Make multiple assertions against the same subject.
 
-The [`.should()`](/api/commands/should) command allows us to pass a callback
+The [`.should()`](/api/commands/should) assertion allows us to pass a callback
 function that takes the yielded subject as its first argument. This works like
 [`.then()`](/api/commands/then), except Cypress automatically **waits and
 retries** for everything inside of the callback function to pass.
@@ -1403,7 +1430,7 @@ by you all share the same timeout values.
 
 ### Applying Timeouts
 
-You can modify a command's timeout. This timeout affects both its default
+You can modify a commands's timeout. This timeout affects both its default
 assertions (if any) and any specific assertions you've added.
 
 Remember because assertions are used to describe a condition of the previous
@@ -1435,11 +1462,8 @@ Under the hood Cypress:
 
 - Queries for the element `.mobile-nav`
 
-  ✨**and waits up to 4 seconds for it to exist in the DOM**✨
-
-  ✨**and waits up to 4 seconds for it to be visible**✨
-
-  ✨**and waits up to 4 seconds for it to contain the text: Home**✨
+  ✨**and waits up to 4 seconds for it to exist in the DOM**✨ ✨**and be
+  visible**✨ ✨**and contain the text: Home**✨
 
 The _total_ amount of time Cypress will wait for _all_ of the assertions to pass
 is for the duration of the [cy.get()](/api/commands/get) `timeout` (which is 4
@@ -1462,11 +1486,8 @@ Under the hood Cypress:
 
 - Gets the element `.mobile-nav`
 
-  ✨**and waits up to 10 seconds for it to exist in the DOM**✨
-
-  ✨**and waits up to 10 seconds for it to be visible**✨
-
-  ✨**and waits up to 10 seconds for it to contain the text: Home**✨
+  ✨**and waits up to 10 seconds for it to exist in the DOM**✨ ✨**and be
+  visible**✨ ✨**and contain the text: Home**✨
 
 Notice that this timeout has flowed down to all assertions and Cypress will now
 wait _up to 10 seconds total_ for all of them to pass.
@@ -1510,5 +1531,5 @@ For instance:
   response for `30000ms`. We expect your application to make a matching request
   quickly, but we expect the server's response to potentially take much longer.
 
-That leaves most other commands including all DOM based commands to time out by
-default after 4000ms.
+That leaves most other commands including all DOM queries to time out by default
+after 4000ms.
diff --git a/content/guides/core-concepts/retry-ability.md b/content/guides/core-concepts/retry-ability.md
index 00b90fb464..b94204b8a8 100644
--- a/content/guides/core-concepts/retry-ability.md
+++ b/content/guides/core-concepts/retry-ability.md
@@ -22,46 +22,49 @@ with fewer run-time surprises.
 <strong class="alert-header">Test Retries</strong>
 
 If you are looking to retry tests a configured number of times when the test
-fails, check out our official guide on
-[Test Retries](/guides/guides/test-retries).
+fails, check out our guide on [Test Retries](/guides/guides/test-retries).
 
 </Alert>
 
-## Commands vs assertions
+## Commands, Queries and Assertions
 
-There are two types of methods you can call in your Cypress tests: **commands**
-and **assertions**. For example, there are 6 commands and 2 assertions in the
-test below.
+While all methods you chain off of `cy` in your Cypress tests are commands,
+there are some different types of commands it's important to understand:
+**queries**, **assertions** and **actions** have special rules about
+retryability. For example, there are 4 queries, an action, and 2 assertions in
+the test below.
 
 ```javascript
-it('creates 2 items', () => {
-  cy.visit('/') // command
-  cy.focused() // command
+it('creates an item', () => {
+  cy.visit('/')
+
+  cy.focused() // query
     .should('have.class', 'new-todo') // assertion
 
-  cy.get('[data-testid="new-todo"]') // command
-    .type('todo A{enter}') // command
-    .type('todo B{enter}') // command
+  cy.get('.new-todo') // query
+    .type('todo A{enter}') // action
 
-  cy.get('[data-testid="todo-list"] li') // command
-    .should('have.length', 2) // assertion
+  cy.get('.todoapp') // query
+    .find('.todo-list li') // query
+    .should('have.length', 1) // assertion
 })
 ```
 
-The [Command Log](/guides/core-concepts/cypress-app#Command-Log) shows both
-commands and assertions with passing assertions showing in green.
+The [Command Log](/guides/core-concepts/cypress-app#Command-Log) shows all
+commands regardless of types, with passing assertions showing in green.
 
-<DocsImage src="/img/guides/retry-ability/v10/command-assertions.png" alt="Cypress tests shoing commands and assertions"></DocsImage>
+<DocsImage src="/img/guides/retry-ability/command-assertions.png" alt="Cypress tests shoing commands and assertions"></DocsImage>
 
-Let's look at the last command and assertion pair:
+Let's look at the last chain of commands:
 
 ```javascript
-cy.get('[data-testid="todo-list"] li') // command
-  .should('have.length', 2) // assertion
+cy.get('.todoapp') // query
+  .children('.todo-list li') // query
+  .should('have.length', 1) // assertion
 ```
 
 Because nothing is synchronous in modern web applications, Cypress can't query
-all the DOM elements with the class `todo-list` and check if there are only two
+all the DOM elements matching `.todo-list li` and check if there is exactly one
 of them. There are many examples of why this would not work well.
 
 - What if the application has not updated the DOM by the time these commands
@@ -71,26 +74,26 @@ of them. There are many examples of why this would not work well.
 - What if the application does some intensive computation before showing the
   results in the DOM?
 
-Thus the Cypress [`cy.get`](/api/commands/get) command has to be smarter and
-expect the application to potentially update. The `cy.get()` queries the
-application's DOM, finds the elements that match the selector, and then tries
-the assertion that follows it (in our case `should('have.length', 2)`) against
-the list of found elements.
-
-- ✅ If the assertion that follows the `cy.get()` command passes, then the
-  command finishes successfully.
-- 🚨 If the assertion that follows the `cy.get()` command fails, then the
-  `cy.get()` command will requery the application's DOM again. Then Cypress will
-  try the assertion against the elements yielded from `cy.get()`. If the
-  assertion still fails, `cy.get()` will try requerying the DOM again, and so on
-  until the `cy.get()` command timeout is reached.
-
-The retry-ability allows the tests to complete each command as soon as the
-assertion passes, without hard-coding waits. If your application takes a few
-milliseconds or even seconds to render each DOM element - no big deal, the test
-does not have to change at all. For example, let's introduce an artificial delay
-of 3 seconds when refreshing the application's UI below in an example TodoMVC
-model code:
+Thus [`cy.get`](/api/commands/get) and [`cy.find()`](/api/commands/find) have to
+be smarter and expect the application to potentially update. `cy.get()` queries
+the application's DOM, finds the elements that match the selector, and then
+passes them to `.find('.todo-list li')`. `.find()` locates a new set of
+elements, and tries the assertion that follows (in our case
+`should('have.length', 1)`) against the list of found elements.
+
+- ✅ If the assertion that follows `cy.find()` passes, then the query finishes
+  successfully.
+- 🚨 If the assertion that follows `cy.find()` fails, then Cypress will requery
+  the application's DOM again - starting from the top of the list of chain. Then
+  Cypress will try the assertion against the elements yielded from
+  `cy.get().find()`. If the assertion still fails, Cypress continues retrying
+  until the `cy.find()` timeout is reached.
+
+Retry-ability allows the test to complete each query as soon as the assertion
+passes, without hard-coding waits. If your application takes a few milliseconds
+or even seconds to render each DOM element - no big deal, the test does not have
+to change at all. For example, let's introduce an artificial delay of 3 seconds
+when refreshing the application's UI below in an example TodoMVC model code:
 
 ```javascript
 app.TodoModel.prototype.addTodo = function (title) {
@@ -107,21 +110,20 @@ app.TodoModel.prototype.addTodo = function (title) {
 }
 ```
 
-My test still passes! The last `cy.get('[data-testid="todo-list"]')` and the
-assertion `should('have.length', 2)` are clearly showing the spinning
-indicators, meaning Cypress is requerying for them.
+The test still passes! `cy.get('.todo-list')` passes immediately - the
+`todo-list` exists - but `.children('li').should('have.length', 1)` show the
+spinning indicators, meaning Cypress is requerying for them.
 
-<DocsImage src="/img/guides/retry-ability/v10/retry-2-items.gif" alt="Retrying finding 2 items"></DocsImage>
+<DocsImage src="/img/guides/retry-ability/retry-assertion.gif" alt="Retrying assertion"></DocsImage>
 
-Within a few milliseconds after the DOM updates, `cy.get()` finds two elements
-and the `should('have.length', 2)` assertion passes
+Within a few milliseconds after the DOM updates, `cy.find()` finds an element
+and the `should('have.length', 1)` assertion passes
 
 ## Multiple assertions
 
-A single command followed by multiple assertions retries each one of them -- in
-order. Thus when the first assertion passes, the command will be retried with
-first and second assertion. When the first and second assertion pass, then the
-command will be retried with the first, second, and third assertion, and so on.
+Queries and assertions are always executed in order, and always retry 'from the
+top'. If you have multiple assertions, Cypress will retry until each passes
+before moving on to the next one.
 
 For example, the following test has [`.should()`](/api/commands/should) and
 [`.and()`](/api/commands/and) assertions. `.and()` is an alias of the
@@ -131,13 +133,20 @@ function with 2 [`expect`](/guides/references/assertions#BDD-Assertions)
 assertions inside of it.
 
 ```javascript
-cy.get('[data-testid="todo-list"] li') // command
-  .should('have.length', 2) // assertion
-  .and(($li) => {
-    // 2 more assertions
-    expect($li.get(0).textContent, 'first item').to.equal('todo a')
-    expect($li.get(1).textContent, 'second item').to.equal('todo B')
-  })
+it('creates two items', () => {
+  cy.visit('/')
+
+  cy.get('.new-todo').type('todo A{enter}')
+  cy.get('.new-todo').type('todo B{enter}')
+
+  cy.get('.todo-list li') // command
+    .should('have.length', 2) // assertion
+    .and(($li) => {
+      // 2 more assertions
+      expect($li.get(0).textContent, 'first item').to.equal('todo a')
+      expect($li.get(1).textContent, 'second item').to.equal('todo B')
+    })
+})
 ```
 
 Because the second assertion
@@ -147,62 +156,30 @@ Command Log correctly shows that the first encountered assertion
 `should('have.length', 2)` passed, but the second assertion and the command
 itself failed.
 
-<DocsImage src="/img/guides/retry-ability/v10/second-assertion-fails.gif" alt="Retrying multiple assertions"></DocsImage>
-
-## Not every command is retried
-
-Cypress only retries commands that query the DOM:
-[`cy.get()`](/api/commands/get), [`.find()`](/api/commands/find),
-[`.contains()`](/api/commands/contains), etc. You can check if a particular
-command is retried by looking at the "Assertions" section in its API
-documentation. For example, "Assertions section" of
-[`.first()`](/api/commands/first) tells us that the command is retried until all
-assertions that follow it are passing.
-
-<List><li>`.first()` will automatically
-[retry](/guides/core-concepts/retry-ability) until the element(s)
-[exist in the DOM](/guides/core-concepts/introduction-to-cypress#Default-Assertions)</li><li>`.first()`
-will automatically [retry](/guides/core-concepts/retry-ability) until all
-chained assertions have passed</li></List>
-
-### Why are some commands _NOT_ retried?
-
-Commands are not retried when they could potentially change the state of the
-application under test. For example, Cypress will not retry the
-[.click()](/api/commands/click) command, because it could change something in
-the application.
-
-<Alert type="warning">
-
-Very rarely you may want to retry a command like `.click()`. We describe one
-case like that where the event listeners are attached to a modal popup only
-after a delay, thus causing default events fired during `.click()` to not
-register. In this special case you may want to "keep clicking" until the event
-registers, and the dialog disappears. Read about it in the
-[When Can the Test Click?](https://www.cypress.io/blog/2019/01/22/when-can-the-test-click/)
-blog post.
-
-</Alert>
+<DocsImage src="/img/guides/retry-ability/second-assertion-fails.gif" alt="Retrying multiple assertions"></DocsImage>
 
 ## Built-in assertions
 
-Often a Cypress command has built-in assertions that will cause the command to
-be retried. For example, the [`.eq()`](/api/commands/eq) command will be retried
-even without any attached assertions until it finds an element with the given
-index in the previously yielded list of elements.
+Often a Cypress command has built-in assertions that will cause the previous
+queries to be retried. For example, the [`.eq()`](/api/commands/eq) query will
+be retried even without any attached assertions until it finds an element with
+the given index.
 
 ```javascript
-cy.get('[data-testid="todo-list"] li') // command
+cy.get('.todo-list li') // query
   .should('have.length', 2) // assertion
-  .eq(3) // command
+  .eq(3) // query
 ```
 
-<DocsImage src="/img/guides/retry-ability/v10/eq.gif" alt="Retrying built-in assertion"></DocsImage>
+<DocsImage src="/img/guides/retry-ability/eq.gif" alt="Retrying built-in assertion"></DocsImage>
 
-Some commands that cannot be retried still have built-in _waiting_. For example,
-as described in the "Assertions" section of [.click()](/api/commands/click), the
-`click()` command waits to click until the element becomes
-[actionable](/guides/core-concepts/interacting-with-elements#Actionability).
+Only queries can be retried, but most other commands still have built-in
+_waiting_. For example, as described in the "Assertions" section of
+[.click()](/api/commands/click), the `click()` action command waits to click
+until the element becomes
+[actionable](/guides/core-concepts/interacting-with-elements#Actionability),
+including re-running the query chain leading up to it in case the page updates
+while we're waiting.
 
 Cypress tries to act like a human user would using the browser.
 
@@ -211,17 +188,17 @@ Cypress tries to act like a human user would using the browser.
 - Is the element behind another element?
 - Does the element have the `disabled` attribute?
 
-The `.click()` command will automatically wait until multiple built-in assertion
-checks like these pass, and then it will attempt to click just once.
+Actions - such as `.click()` - automatically wait until multiple built-in
+assertions like these pass, and then it will attempt to click just once.
 
 ## Timeouts
 
-By default each command that retries, does so for up to 4 seconds - the
+By default each command that retries does so for up to 4 seconds - the
 [`defaultCommandTimeout`](/guides/references/configuration#Timeouts) setting.
 
 ### Increase time to retry
 
-You can change this timeout for _all commands_. See
+You can change the default timeout for _all commands_. See
 [Configuration: Overriding Options](/guides/references/configuration#Overriding-Options)
 for examples of overriding this option.
 
@@ -250,8 +227,8 @@ the "Introduction to Cypress" guide.
 
 ### Disable retry
 
-Overriding the timeout to `0` will essentially disable retrying the command,
-since it will spend 0 milliseconds retrying.
+Overriding the timeout to `0` will essentially disable retrying the query or
+waiting on an other, since it will spend 0 milliseconds retrying.
 
 ```javascript
 // check synchronously that the element does not exist (no retry)
@@ -259,300 +236,146 @@ since it will spend 0 milliseconds retrying.
 cy.get('[data-testid="ssr-error"]', { timeout: 0 }).should('not.exist')
 ```
 
-## Only the last command is retried
+## Only queries are retried
 
-Here is a short test that demonstrates some flake.
+Any command that isn't a query, such as `cy.click()`, follows different rules
+than queries do. Cypress will retry any queries _leading up to_ a command, and
+retry any assertions _after_ a command, but commands themselves never retry -
+nor does anything leading up to them after they've resolved.
 
-<e2e-or-ct>
-<template #e2e>
+Most commands are not retried because they could potentially change the state of
+the application under test. For example, Cypress will not retry the
+[.click()](/api/commands/click) action command, because it could change
+something in the application. After the click occurs, Cypress will also not
+re-run any queries before `.click()`.
 
-```js
-it('adds two items', () => {
-  cy.visit('/')
+### Actions should be at the end of chains, not the middle
 
-  cy.get('[data-testid="new-todo"]').type('todo A{enter}')
-  cy.get('[data-testid="todo-list"] li')
-    .find('label')
-    .should('contain', 'todo A')
+The following test might have problems if:
 
-  cy.get('[data-testid="new-todo"]').type('todo B{enter}')
-  cy.get('[data-testid="todo-list"] li')
-    .find('label')
-    .should('contain', 'todo B')
-})
-```
-
-</template>
-<template #ct>
-
-```js
-it('adds two items', () => {
-  cy.mount(<Todos />)
-
-  cy.get('[data-testid="new-todo"]').type('todo A{enter}')
-  cy.get('[data-testid="todo-list"] li')
-    .find('label')
-    .should('contain', 'todo A')
-
-  cy.get('[data-testid="new-todo"]').type('todo B{enter}')
-  cy.get('[data-testid="todo-list"] li')
-    .find('label')
-    .should('contain', 'todo B')
-})
-```
+- Your JS framework re-rendered asynchronously
+- Your app code reacted to an event firing and removed the element
 
-</template>
-</e2e-or-ct>
-
-The test passes in Cypress without a hitch.
-
-<DocsImage src="/img/guides/retry-ability/v10/adds-two-items-passes.gif" alt="Test passes"></DocsImage>
-
-But sometimes the test fails - not usually locally, no - it almost always fails
-on our continuous integration server. When the test fails, the recorded video
-and screenshots are NOT showing any obvious problems! Here is the failing test
-video:
-
-<DocsImage src="/img/guides/retry-ability/v10/adds-two-items-fails.gif" alt="Test fails"></DocsImage>
-
-The problem looks weird - I can clearly see the label "todo B" present in the
-list, so why isn't Cypress finding it? What is going on?
-
-Remember the delay we introduced into our application code that causes the test
-to time out? We added a 100ms delay before the UI rerenders itself.
+#### <Icon name="exclamation-triangle" color="red"></Icon> Incorrectly chaining commands
 
 ```javascript
-app.TodoModel.prototype.addTodo = function (title) {
-  this.todos = this.todos.concat({
-    id: Utils.uuid(),
-    title: title,
-    completed: false,
-  })
-
-  setTimeout(() => {
-    this.inform()
-  }, 100)
-}
+cy.get('.new-todo')
+  .type('todo A{enter}') // action
+  .type('todo B{enter}') // action after another action - bad
+  .should('have.class', 'active') // assertion after an action - bad
 ```
 
-This delay could be the source of our flaky tests when the application is
-running on our CI server. Here is how to see the source of the problem. In the
-Command Log, hover over each command to see which elements Cypress found at each
-step.
-
-In the failing test, the first label was indeed found correctly:
-
-<DocsImage src="/img/guides/retry-ability/v10/first-item-label.png" alt="First item label"></DocsImage>
-
-Hover over the second "FIND label" command - something is wrong here. It found
-the _first label_, then kept requerying to find the text "todo B", but the first
-item always remains "todo A".
-
-<DocsImage src="/img/guides/retry-ability/v10/second-item-label.png" alt="Second item label"></DocsImage>
-
-Hmm, weird, why is Cypress only looking at the _first_ item? Let's hover over
-the "GET .todo-list li" command to inspect what _that command found_. Ohh,
-interesting - there was only one item at that moment.
-
-<DocsImage src="/img/guides/retry-ability/v10/second-get-li.png" alt="Second get li"></DocsImage>
-
-During the test, the `cy.get('[data-testid="todo-list"] li')` command quickly
-found the rendered `<li>` item - and that item was the first and only "todo A"
-item. Our application was waiting 100ms before appending the second item "todo
-B" to the list. By the time the second item was added, Cypress had already
-"moved on", working only with the first `<li>` element. It only searched for
-`<label>` inside the first `<li>` element, completely ignoring the newly created
-2nd item.
-
-To confirm this, let's remove the artificial delay to see what's happening in
-the passing test.
-
-<DocsImage src="/img/guides/retry-ability/v10/two-items.png" alt="Two items"></DocsImage>
+#### <Icon name="check-circle" color="green"></Icon> Correctly ending chains after an action
 
-When the web application runs without the delay, it gets its items into the DOM
-before the Cypress command `cy.get('[data-testid="todo-list"] li')` runs. After
-the `cy.get()` returns 2 items, the `.find()` command just has to find the right
-label. Great.
-
-Now that we understand the real reason behind the flaky test, we need to think
-about why the default retry-ability has not helped us in this situation. Why
-hasn't Cypress found the 2 `<li>` elements after the second one was added?
-
-For a variety of implementation reasons, Cypress commands **only** retry the
-**last command** before the assertion. In our test:
+To avoid these issues entirely, it is better to split up the above chain of
+commands.
 
 ```javascript
-cy.get('[data-testid="new-todo"]').type('todo B{enter}')
-cy.get('[data-testid="todo-list"] li') // queries immediately, finds 1 <li>
-  .find('label') // retried, retried, retried with 1 <li>
-  .should('contain', 'todo B') // never succeeds with only 1st <li>
+cy.get('.new-todo').type('todo A{enter}')
+cy.get('.new-todo').type('todo B{enter}')
+cy.get('.new-todo').should('have.class', 'active')
 ```
 
-## Use retry-ability correctly
+Writing your tests in this way will help you avoid issues where the page
+rerenders in the middle of your test and Cypress loses track of which elements
+it's supposed to be operating or asserting on. Aliases -
+[`cy.as()`](/api/commands/as) - can help make this pattern less intrusive.
 
-Luckily, once we understand how retry-ability works and how only the last
-command is used for assertion retries, we can fix this test for good.
+```javascript
+cy.get('.new-todo').as('new')
 
-### Merging queries
+cy.get('@new').type('todo A{enter}')
+cy.get('@new').type('todo B{enter}')
+cy.get('@new').should('have.class', 'active')
+```
 
-The first solution we recommend is to avoid unnecessarily splitting commands
-that query elements. Instead of
-`cy.get('[data-testid="todo-list"] li').find('label')` we can combine two
-separate queries into one - forcing the combined query to be retried.
+<Alert type="warning">
 
-<e2e-or-ct>
-<template #e2e>
+Very rarely you may want to retry a command like `.click()`. We describe one
+case like that where the event listeners are attached to a modal popup only
+after a delay, thus causing default events fired during `.click()` to not
+register. In this special case you may want to "keep clicking" until the event
+registers, and the dialog disappears. Read about it in the
+[When Can the Test Click?](https://www.cypress.io/blog/2019/01/22/when-can-the-test-click/)
+blog post.
 
-```js
-it('adds two items', () => {
-  cy.visit('/')
+Because of the assertions built into every command, and action commands in
+particular, you should rarely need this pattern.
 
-  cy.get('[data-testid="new-todo"]').type('todo A{enter}')
-  cy.get('[data-testid="todo-list"] li label') // 1 query command
-    .should('contain', 'todo A') // assertion
+</Alert>
 
-  cy.get('[data-testid="new-todo"]').type('todo B{enter}')
-  cy.get('[data-testid="todo-list"] li label') // 1 query command
-    .should('contain', 'todo B') // assertion
-})
-```
+As another example, when confirming that the button component invokes the
+`click` prop testing with the
+[cypress/react](https://github.com/cypress-io/cypress/tree/master/npm/react)
+mounting library, the following test might or might not work:
 
-</template>
-<template #ct>
+#### <Icon name="exclamation-triangle" color="red"></Icon> Incorrectly checking if the stub was called
 
 ```js
-it('adds two items', () => {
-  cy.mount(<Todos />)
-
-  cy.get('[data-testid="new-todo"]').type('todo A{enter}')
-  cy.get('[data-testid="todo-list"] li label') // 1 query command
-    .should('contain', 'todo A') // assertion
+const Clicker = ({ click }) => (
+  <div>
+    <button onClick={click}>Click me</button>
+  </div>
+)
 
-  cy.get('[data-testid="new-todo"]').type('todo B{enter}')
-  cy.get('[data-testid="todo-list"] li label') // 1 query command
-    .should('contain', 'todo B') // assertion
+it('calls the click prop twice', () => {
+  const onClick = cy.stub()
+  cy.mount(<Clicker click={onClick} />)
+  cy.get('button')
+    .click()
+    .click()
+    .then(() => {
+      // works in this case, but not recommended
+      // because .click() and .then() do not retry
+      expect(onClick).to.be.calledTwice
+    })
 })
 ```
 
-</template>
-</e2e-or-ct>
-
-To show the retries, I increased the application's artificial delay to 500ms.
-The test now always passes because the entire selector is retried. It finds 2
-list elements when the second "todo B" is added to the DOM.
-
-<DocsImage src="/img/guides/retry-ability/v10/combined-selectors.gif" alt="Combined selector"></DocsImage>
-
-<Alert type="info">
-
-<strong class="alert-header">Use
-[`cy.contains`](/api/commands/contains)</strong>
-
-**Tip:** instead of `cy.get(selector).should('contain', text)` or
-`cy.get(selector).contains(text)` chain, we recommend using
-`cy.contains(selector, text)` which is retried automatically as a single
-command.
-
-```javascript
-cy.get('[data-testid="new-todo"]').type('todo A{enter}')
-cy.contains('[data-testid="todo-list"] li', 'todo A')
-cy.get('[data-testid="new-todo"]').type('todo B{enter}')
-// you can use a regular expression
-// to match the text exactly
-cy.contains('[data-testid="todo-list"] li', /^todo B$/)
-```
-
-</Alert>
-
-Similarly, when working with deeply nested JavaScript properties using the
-[`.its()`](/api/commands/its) command, try not to split it across multiple
-calls. Instead, combine property names into a single call using the `.`
-separator:
+The above example will fail if the component calls the `click` prop after a
+delay.
 
-```javascript
-// 🛑 not recommended
-// only the last "its" will be retried
-cy.window()
-  .its('app') // runs once
-  .its('model') // runs once
-  .its('todos') // retried
-  .should('have.length', 2)
-
-// ✅ recommended
-cy.window()
-  .its('app.model.todos') // retried
-  .should('have.length', 2)
+```js
+const Clicker = ({ click }) => (
+  <div>
+    <button onClick={() => setTimeout(click, 500)}>Click me</button>
+  </div>
+)
 ```
 
-See the
-[Set flag to start tests](https://glebbahmutov.com/blog/set-flag-to-start-tests/)
-blog for the full example.
-
-### Alternate commands and assertions
+<DocsImage src="/img/guides/retry-ability/delay-click.png" alt="Expect fails the test without waiting for the delayed stub"></DocsImage>
 
-There is another way to fix our flaky test. Whenever you write a longer test, we
-recommend alternating commands with assertions. In this case, I will add an
-assertion after the `cy.get()` command, but before the `.find()` command.
-
-<e2e-or-ct>
-<template #e2e>
+The test finishes before the component calls the `click` prop twice, and without
+retrying the assertion `expect(onClick).to.be.calledTwice`.
 
-```js
-it('adds two items', () => {
-  cy.visit('/')
+It could also fail if React decides to rerender the DOM between clicks.
 
-  cy.get('[data-testid="new-todo"]').type('todo A{enter}')
-  cy.get('[data-testid="todo-list"] li') // command
-    .should('have.length', 1) // assertion
-    .find('label') // command
-    .should('contain', 'todo A') // assertion
-
-  cy.get('[data-testid="new-todo"]').type('todo B{enter}')
-  cy.get('[data-testid="todo-list"] li') // command
-    .should('have.length', 2) // assertion
-    .find('label') // command
-    .should('contain', 'todo B') // assertion
-})
-```
+#### <Icon name="check-circle" color="green"></Icon> Correctly waiting for the stub to be called
 
-</template>
-<template #ct>
+We recommend aliasing the stub using the [`.as`](/api/commands/as) command and
+using `cy.get('@alias').should(...)` assertions.
 
 ```js
-it('adds two items', () => {
-  cy.mount(<Todos />)
+it('calls the click prop', () => {
+  const onClick = cy.stub().as('clicker')
 
-  cy.get('[data-testid="new-todo"]').type('todo A{enter}')
-  cy.get('[data-testid="todo-list"] li') // command
-    .should('have.length', 1) // assertion
-    .find('label') // command
-    .should('contain', 'todo A') // assertion
+  cy.mount(<Clicker click={onClick} />)
+  // Good practice 💡: Don't chain anything off of commands
+  cy.get('button').click()
+  cy.get('button').click()
 
-  cy.get('[data-testid="new-todo"]').type('todo B{enter}')
-  cy.get('[data-testid="todo-list"] li') // command
-    .should('have.length', 2) // assertion
-    .find('label') // command
-    .should('contain', 'todo B') // assertion
+  // Good practice 💡: Reference the stub with an alias
+  cy.get('@clicker').should('have.been.calledTwice')
 })
 ```
 
-</template>
-</e2e-or-ct>
-
-<DocsImage src="/img/guides/retry-ability/v10/alternating-commands-assertions.png" alt="Passing test"></DocsImage>
-
-The test passes, because the second `cy.get('[data-testid="todo-list"] li')` is
-retried with its own assertion now `.should('have.length', 2)`. Only after
-successfully finding two `<li>` elements, the command `.find('label')` and its
-assertion starts, and by now, the item with the correct "todo B" label has been
-correctly queried.
+<DocsImage src="/img/guides/retry-ability/click-twice.gif" alt="Retrying the assertions using a stub alias"></DocsImage>
 
 ### Use `.should()` with a callback
 
-If you have to use commands that cannot be retried, but need to retry the entire
-chain, consider rewriting the commands into a single
-[.should(callbackFn)](/api/commands/should#Function) chained off the very first
-retry-able command.
+If you are using commands, but need to retry the entire chain, consider
+rewriting the commands into a
+[.should(callbackFn)](/api/commands/should#Function).
 
 Below is an example where the number value is set after a delay:
 
@@ -568,9 +391,9 @@ Below is an example where the number value is set after a delay:
 </script>
 ```
 
-<DocsImage src="/img/guides/retry-ability/v10/random-number.gif" alt="Random number"></DocsImage>
+<DocsImage src="/img/guides/retry-ability/random-number.gif" alt="Random number"></DocsImage>
 
-#### <Icon name="exclamation-triangle" color="red"></Icon> Incorrectly waiting for values
+### <Icon name="exclamation-triangle" color="red"></Icon> Incorrectly waiting for values
 
 You may want to write a test like below, to test that the number is between 1
 and 10, although **this will not work as intended**. The test yields the
@@ -588,7 +411,7 @@ cy.get('[data-testid="random-number"]') // <div>🎁</div>
 Unfortunately, the [.then()](/api/commands/then) command is not retried. Thus
 the test only runs the entire chain once before failing.
 
-<DocsImage src="/img/guides/retry-ability/v10/random-number-first-attempt.png" alt="First attempt at writing the test"></DocsImage>
+<DocsImage src="/img/guides/retry-ability/random-number-first-attempt.png" alt="First attempt at writing the test"></DocsImage>
 
 #### <Icon name="check-circle" color="green"></Icon> Correctly waiting for values
 
@@ -610,93 +433,14 @@ The above test retries getting the element and invoking the text of the element
 to get the number. When the number is finally set in the application, then the
 `gte` and `lte` assertions pass and the test passes.
 
-<DocsImage src="/img/guides/retry-ability/v10/random-number-callback.gif" alt="Random number using callback"></DocsImage>
-
-### Use aliases
-
-When using [`cy.stub()`](/api/commands/stub) or [`cy.spy()`](/api/commands/spy)
-to test application's code, a good practice is to give it an alias and use the
-`cy.get('@alias').should('...')` assertion to retry.
-
-For example, when confirming that the button component invokes the `click` prop
-testing with the
-[cypress/react](https://github.com/cypress-io/cypress/tree/master/npm/react)
-mounting library, the following test might or might not work:
-
-#### <Icon name="exclamation-triangle" color="red"></Icon> Incorrectly checking if the stub was called
-
-```js
-const Clicker = ({ click }) => (
-  <div>
-    <button onClick={click}>Click me</button>
-  </div>
-)
-
-it('calls the click prop twice', () => {
-  const onClick = cy.stub()
-  cy.mount(<Clicker click={onClick} />)
-  cy.get('button')
-    .click()
-    .click()
-    .then(() => {
-      // works in this case, but not recommended
-      // because .then() does not retry
-      expect(onClick).to.be.calledTwice
-    })
-})
-```
-
-The above example will fail if the component calls the `click` prop after a
-delay.
-
-```js
-const Clicker = ({ click }) => (
-  <div>
-    <button onClick={() => setTimeout(click, 500)}>Click me</button>
-  </div>
-)
-```
-
-<DocsImage src="/img/guides/retry-ability/v10/delay-click.png" alt="Expect fails the test without waiting for the delayed stub"></DocsImage>
-
-The test finishes before the component calls the `click` prop twice, and without
-retrying the assertion `expect(onClick).to.be.calledTwice`.
-
-#### <Icon name="check-circle" color="green"></Icon> Correctly waiting for the stub to be called
-
-We recommend aliasing the stub using the [`.as`](/api/commands/as) command and
-using `cy.get('@alias').should(...)` assertions.
-
-```js
-it('calls the click prop', () => {
-  const onClick = cy.stub().as('clicker')
-  cy.mount(<Clicker click={onClick} />)
-  cy.get('button').click().click()
-
-  // good practice 💡
-  // auto-retry the stub until it was called twice
-  cy.get('@clicker').should('have.been.calledTwice')
-})
-```
-
-<DocsImage src="/img/guides/retry-ability/v10/click-twice.gif" alt="Retrying the assertions using a stub alias"></DocsImage>
-
-Watch the short video below to see this example in action
-
-<!-- textlint-disable -->
-
-<DocsVideo src="https://youtube.com/embed/AlltFcsIFvc"></DocsVideo>
-
-<!-- textlint-enable -->
+<DocsImage src="/img/guides/retry-ability/random-number-callback.gif" alt="Random number using callback"></DocsImage>
 
 ## See also
 
 - Read our blog posts about fighting
   [the test flake](https://cypress.io/blog/tag/flake/).
 - You can add retry-ability to your own
-  [custom commands](/api/cypress-api/custom-commands); see
-  [this pull request to cypress-xpath](https://github.com/cypress-io/cypress-xpath/pull/12/files)
-  for an example.
+  [custom commands](/api/cypress-api/custom-commands) and queries.
 - You can retry any function with attached assertions using the 3rd party
   plugins [cypress-pipe](https://github.com/NicholasBoll/cypress-pipe) and
   [cypress-wait-until](https://github.com/NoriSte/cypress-wait-until).
@@ -704,9 +448,6 @@ Watch the short video below to see this example in action
   [cypress-recurse](https://github.com/bahmutov/cypress-recurse) can be used to
   implement the
   [visual testing with retry-ability for canvas elements](https://glebbahmutov.com/blog/canvas-testing/)
-- See retry-ability examples in the
-  [Cypress should callback](https://glebbahmutov.com/blog/cypress-should-callback/)
-  blog post.
 - To learn how to enable Cypress' test retries functionality, which retries
-  tests that fail up to the configured number, check out our official guide on
+  tests that fail, check out our official guide on
   [Test Retries](/guides/guides/test-retries).
diff --git a/content/guides/core-concepts/variables-and-aliases.md b/content/guides/core-concepts/variables-and-aliases.md
index 5a24fdcf94..7188bfbba4 100644
--- a/content/guides/core-concepts/variables-and-aliases.md
+++ b/content/guides/core-concepts/variables-and-aliases.md
@@ -72,7 +72,7 @@ cy.get('button').then(($btn) => {
 
 If you're familiar with
 [native Promises](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)
-the Cypress `.then()` works the same way. You can continue to nest more Cypress
+the Cypress `.then()` works similarly. You can continue to nest more Cypress
 commands inside of the `.then()`.
 
 Each nested command has access to the work done in previous commands. This ends
@@ -355,8 +355,8 @@ it('is not using aliases correctly', function () {
 })
 ```
 
-The same principles we introduced many times before apply to this situation. If
-you want to access what a command yields you have to do it in a closure using a
+The same principles we introduced before apply to this situation. If you want to
+access what a command yields you have to do it in a closure using a
 [`.then()`](/api/commands/then).
 
 ```js
@@ -413,14 +413,32 @@ it('utilize users in some way', function () {
 
 By using [`cy.get()`](/api/commands/get) we avoid the use of `this`.
 
-Keep in mind that there are use cases for both approaches because they have
-different ergonomics.
+Keep in mind that there are use cases for both approaches because they have one
+major difference.
 
-When using `this.users` we have access to it synchronously, whereas when using
-`cy.get('@users')` it becomes an asynchronous command.
+When using `this.users`, it is stored on the context when it is first evaluated.
+But when using `cy.get('@users')`, any queries are re-evaluated every time the
+alias is accessed.
 
-You can think of the `cy.get('@users')` as doing the same thing as
-[`cy.wrap(this.users)`](/api/commands/wrap).
+```javascript
+const favorites = { color: 'blue' }
+
+cy.wrap(favorites).its('color').as('favoriteColor')
+
+cy.then(function () {
+  favorites.color = 'red'
+})
+
+cy.get('@favoriteColor').then(function (aliasValue) {
+  expect(aliasColor).to.eql('red')
+
+  expect(this.color).to.eql('blue')
+})
+```
+
+In the second `.then()` block, `cy.get('@favoriteColor')` runs
+`cy.wrap(favorites).its('color')` fresh each time, but `this.color` was set when
+the alias was first stored, back when our favorite color was blue.
 
 ### Elements
 
@@ -450,10 +468,9 @@ existing alias called `rows` and returns the reference (if it finds it).
 
 #### Stale Elements:
 
-In many single-page JavaScript applications the DOM re-renders parts of the
-application constantly. If you alias DOM elements that have been removed from
-the DOM by the time you call [`cy.get()`](/api/commands/get) with the alias,
-Cypress automatically re-queries the DOM to find these elements again.
+In many single-page applications, the JavaScript re-renders parts of the DOM
+constantly. This is why we always re-run queries when you fetch an alias, so you
+never end up with stale elements.
 
 ```html
 <ul id="todos">
@@ -476,35 +493,31 @@ place.
 
 ```javascript
 cy.get('[data-testid="todos"] li').first().as('firstTodo')
+
 cy.get('@firstTodo').find('.edit').click()
+
 cy.get('@firstTodo')
   .should('have.class', 'editing')
   .find('input')
   .type('Clean the kitchen')
 ```
 
-When we reference `@firstTodo`, Cypress checks to see if all of the elements it
-is referencing are still in the DOM. If they are, it returns those existing
-elements. If they aren't, Cypress replays the commands leading up to the alias
-definition.
+Every time we reference `@firstTodo`, Cypress re-runs the queries leading up to
+the alias definition.
 
-In our case it would re-issue the commands: `cy.get('#todos li').first()`.
+In our case it would re-query the DOM using: `cy.get('#todos li').first()`.
 Everything works because the new `<li>` is found.
 
 <Alert type="warning">
 
 _Usually_, replaying previous commands will return what you expect, but not
-always. It is recommended that you **alias elements as soon as possible**
-instead of further down a chain of commands.
+always. It is recommended that you **alias elements before running commands**.
 
-- `cy.get('nav header [data-testid="user"]').as('user')`
+- `cy.get('nav').find('header').find('[data-testid="user"]').as('user').click()`
   <Icon name="check-circle" color="green"></Icon> (good)
-- `cy.get('nav').find('header').find('[data-testid="user"]').as('user')`
+- `cy.get('nav').find('header').find('[data-testid="user"]').click().as('user')`
   <Icon name="exclamation-triangle" color="red"></Icon> (bad)
 
-When in doubt, you can _always_ issue a regular [`cy.get()`](/api/commands/get)
-to query for the elements again.
-
 </Alert>
 
 ### Intercepts
diff --git a/content/guides/core-concepts/writing-and-organizing-tests.md b/content/guides/core-concepts/writing-and-organizing-tests.md
index 511142e903..5256708d3f 100644
--- a/content/guides/core-concepts/writing-and-organizing-tests.md
+++ b/content/guides/core-concepts/writing-and-organizing-tests.md
@@ -905,9 +905,10 @@ describe('TodoMVC', () => {
 
   it.skip('adds 2 todos', function () {
     cy.visit('/')
-    cy.get('[data-testid="new-todo"]')
-      .type('learn testing{enter}')
-      .type('be cool{enter}')
+    cy.get('[data-testid="new-todo"]').as('new').type('learn testing{enter}')
+
+    cy.get('@new').type('be cool{enter}')
+
     cy.get('[data-testid="todo-list"] li').should('have.length', 100)
   })
 
@@ -945,9 +946,10 @@ describe('TodoMVC', () => {
   })
 
   it('adds 2 todos', () => {
-    cy.get('[data-testid="new-todo"]')
-      .type('learn testing{enter}')
-      .type('be cool{enter}')
+    cy.get('[data-testid="new-todo"]').as('new').type('learn testing{enter}')
+
+    cy.get('@new').type('be cool{enter}')
+
     cy.get('[data-testid="todo-list"] li').should('have.length', 2)
   })
 })
diff --git a/content/guides/end-to-end-testing/writing-your-first-end-to-end-test.md b/content/guides/end-to-end-testing/writing-your-first-end-to-end-test.md
index e6bca1507b..e899ad96f8 100644
--- a/content/guides/end-to-end-testing/writing-your-first-end-to-end-test.md
+++ b/content/guides/end-to-end-testing/writing-your-first-end-to-end-test.md
@@ -357,6 +357,11 @@ class. Then we can use the [.type()](/api/commands/type) command to enter text
 into the selected input. Finally, we can verify that the value of the input
 reflects the text that was typed with another [.should()](/api/commands/should).
 
+In general, the structure of your test should flow query -> query -> command or
+assertion(s). It's best practice not to chain anything after an action command;
+for more details on why this is, see our guide on
+[retry-ability](/guides/core-concepts/retry-ability).
+
 ```js
 describe('My First Test', () => {
   it('Gets, types and asserts', () => {
@@ -368,11 +373,11 @@ describe('My First Test', () => {
     // includes '/commands/actions'
     cy.url().should('include', '/commands/actions')
 
-    // Get an input, type into it and verify
-    // that the value has been updated
-    cy.get('.action-email')
-      .type('fake@email.com')
-      .should('have.value', 'fake@email.com')
+    // Get an input, type into it
+    cy.get('.action-email').type('fake@email.com')
+
+    //  Verify that the value has been updated
+    cy.get('.action-email').should('have.value', 'fake@email.com')
   })
 })
 ```
@@ -399,7 +404,7 @@ the new page. If we read it out loud, it might sound like:
 > 5. Assert it includes: `/commands/actions`
 > 6. Get the input with the `action-email` class
 > 7. Type `fake@email.com` into the input
-> 8. Assert the input reflects the new value
+> 8. Get the input again and assert that it reflects the new value
 
 Or in the Given, When, Then syntax:
 
diff --git a/content/guides/references/best-practices.md b/content/guides/references/best-practices.md
index 1b1e8a80e0..73d1f91d6d 100644
--- a/content/guides/references/best-practices.md
+++ b/content/guides/references/best-practices.md
@@ -224,8 +224,8 @@ to assign the return value of Commands with `const`, `let`, or `var`.
 <Alert type="success">
 
 <Icon name="check-circle" color="green"></Icon> **Best Practice:** Use
-[closures to access and store](/guides/core-concepts/variables-and-aliases) what
-Commands yield you.
+[aliases and closures to access and store](/guides/core-concepts/variables-and-aliases)
+what Commands yield you.
 
 </Alert>
 
@@ -242,6 +242,10 @@ cy.visit('https://example.cypress.io')
 
 // nope, fails
 a.first().click()
+
+// Instead, do this.
+cy.get('a').as('links')
+cy.get('@links').first().click()
 ```
 
 <Alert type="info">
diff --git a/content/guides/references/error-messages.md b/content/guides/references/error-messages.md
index ca46919c36..776e838524 100644
--- a/content/guides/references/error-messages.md
+++ b/content/guides/references/error-messages.md
@@ -126,10 +126,10 @@ better way to accomplish what you're trying to do. Read through the
 [chat with someone in Discord](https://discord.gg/ncdA3Jz63n), or
 [open an issue](https://github.com/cypress-io/cypress/issues/new/choose).
 
-### <Icon name="exclamation-triangle" color="red"></Icon> `cy...()` failed because the element you are chaining off of has become detached or removed from the dom
+### <Icon name="exclamation-triangle" color="red"></Icon> `cy...()` failed because the page updated
 
 Getting this error means you've tried to interact with a "dead" DOM element -
-meaning it's been detached or completely removed from the DOM.
+meaning the current subject has been removed from the DOM.
 
 <!--
 To reproduce the following screenshot:
@@ -137,27 +137,10 @@ describe('detachment example', () => {
   beforeEach(() => {
     cy.get('body').then(($body) => {
       const $outer = Cypress.$('<div />').appendTo($body)
-      Cypress.$('<button />').on('click', () => { $outer[0].remove() }).appendTo($outer)
+      Cypress.$('<button />').appendTo($outer).click(function () { Cypress.$(this).replaceWith(this.outerHTML) })
     })
   })
-  it('detaches from dom', () => {
-    cy.get('button')
-    .click()
-    .parent()
-    .should('have.text', 'Clicked')
-  })
-})
--->
 
-<!--
-To reproduce the following screenshot:
-describe('detachment example', () => {
-  beforeEach(() => {
-    cy.get('body').then(($body) => {
-      const $outer = Cypress.$('<div />').appendTo($body)
-      Cypress.$('<button />').on('click', () => { $outer[0].remove() }).appendTo($outer)
-    })
-  })
   it('detaches from dom', () => {
     cy.get('button')
     .click()
@@ -167,11 +150,11 @@ describe('detachment example', () => {
 })
 -->
 
-<DocsImage src="/img/guides/references/cy-method-failed-element-is-detached.png" alt="cy.method() failed because element is detached" ></DocsImage>
+<DocsImage src="/img/guides/references/cy-method-failed-page-updated.png" alt="cy.method() failed because the page updated" ></DocsImage>
 
-Cypress errors because it can't interact with "dead" elements - much like a real
-user could not do this either. Understanding how this happens is very
-important - and it is often preventable.
+Cypress errors because after a command, the subject becomes 'fixed' to a
+specific element - since it can't retry commands, if the element becomes
+detached from the page, we can't assert or interact on it.
 
 Let's take a look at an example below.
 
@@ -190,8 +173,9 @@ Let's take a look at an example below.
 ```javascript
 $('button').click(function () {
   // when the <button> is clicked
-  // we remove the button from the DOM
-  $(this).remove()
+  // we remove the button from the DOM,
+  // and add a new, identical one.
+  $(this).replaceWith(this.outerHTML)
 })
 ```
 
@@ -203,47 +187,36 @@ cy.get('button').click().parent()
 
 We've programmed our application above so that as soon as the `click` event
 happens, the button is removed from the DOM. When Cypress begins processing the
-next command ([`.parent()`](/api/commands/parent)) in the test above, it detects
-that the yielded subject (the button) is detached from the DOM and throws the
-error.
+next query ([`.parent()`](/api/commands/parent)) in the test above, it detects
+that the yielded subject (the original button) is detached from the DOM and
+throws the error.
+
+Fortunately, the error tells us exactly what to do:
 
-We can prevent Cypress from throwing this error by rewriting our test code.
+> You can typically solve this by breaking up a chain.
 
 #### Fixed Test Code
 
 ```javascript
 cy.get('button').click()
-cy.get('[data-testid="parent"]')
+cy.get('button').parent()
 ```
 
-The above example is an oversimplification. Let's look at a more complex
-example.
-
-In modern JavaScript frameworks, DOM elements are regularly re-rendered -
-meaning that the old element is thrown away and a new one is put in its place.
-Because this happens so fast, it may _appear_ as if nothing has visibly changed
-to the user. But if you are in the middle of executing test commands, it's
-possible the element you're interacting with has become "dead". To deal with
-this situation you must:
-
-- Understand when your application re-renders
-- Re-query for newly added DOM elements
-- _Guard_ Cypress from running commands until a specific condition is met
-
-When we say _guard_, this usually means:
-
-- Writing an assertion
-- Waiting on an XHR
-
-#### More info
-
-<Alert type="info">
-
-Read the blog post
-[Do Not Get Too Detached](https://www.cypress.io/blog/2020/07/22/do-not-get-too-detached/)
-for another example of this error, and how to solve it.
-
-</Alert>
+The above example is an oversimplification, but a representative one. In modern
+JavaScript frameworks, DOM elements are regularly re-rendered - meaning that the
+old element is thrown away and a new one is put in its place. Because this
+happens so fast, it may _appear_ as if nothing has visibly changed to the user.
+But if you are in the middle of executing test commands, it's possible the
+element you're interacting with has become "dead". To deal with this situation
+you must:
+
+- Always start a new chain after each _command_.
+- Use Cypress _queries_ to locate elements on the page, rather than using
+  specific HTML elements as your subject
+
+Queries (`.get()`, `.as()` and`.parent()`, for example) and assertions
+(`.should()`, `.and()`) are safe to chain off of. Commands (such as `.click()`)
+are not.
 
 ### <Icon name="exclamation-triangle" color="red"></Icon> `cy....()` failed because the element cannot be interacted with
 
diff --git a/content/guides/references/trade-offs.md b/content/guides/references/trade-offs.md
index c0297bb274..ed9e4737ee 100644
--- a/content/guides/references/trade-offs.md
+++ b/content/guides/references/trade-offs.md
@@ -37,7 +37,6 @@ Many of these issues are currently being worked on or are on our
 - [Workarounds for the lack of a `cy.hover()` command.](/api/commands/hover)
 - [`cy.tab()` command.](https://github.com/cypress-io/cypress/issues/299)
 - [There is not any native or mobile events support.](https://github.com/cypress-io/cypress/issues/311#issuecomment-339824191)
-- [Testing file uploads is application specific.](https://github.com/cypress-io/cypress/issues/170#issuecomment-340012621)
 - [iframe support is somewhat limited, but does work.](https://github.com/cypress-io/cypress/issues/136)
 
 ## Permanent trade-offs
diff --git a/cypress/fixtures/sidebar-overrides.json b/cypress/fixtures/sidebar-overrides.json
index 93259bcef8..3277fbc257 100644
--- a/cypress/fixtures/sidebar-overrides.json
+++ b/cypress/fixtures/sidebar-overrides.json
@@ -1,12 +1,18 @@
 {
   "SIDEBAR_TEXT": {
-    "/guides/references/assertions": "Assertions"
+    "/guides/references/assertions": "Assertions",
+    "/guides/core-concepts/retry-ability": "Retry-ability",
+    "/guides/core-concepts/interacting-with-elements": "Interacting with Elements"
   },
   "CATEGORY_SLUG": {
-    "/guides/references/assertions": "references"
+    "/guides/references/assertions": "references",
+    "/guides/core-concepts/retry-ability": "core-concepts",
+    "/guides/core-concepts/interacting-with-elements": "core-concepts"
   },
   "PAGE_TITLE": {
     "/guides/dashboard/introduction": "Dashboard",
+    "/guides/core-concepts/retry-ability": "Retry-ability",
+    "/guides/core-concepts/interacting-with-elements": "Interacting with Elements",
     "/guides/end-to-end-testing/protractor-to-cypress": "Migrating from Protractor to Cypress",
     "/guides/end-to-end-testing/writing-your-first-end-to-end-test": "Writing Your First E2E Test",
     "/guides/references/assertions": "Assertions",
diff --git a/scripts/yields.js b/scripts/yields.js
deleted file mode 100644
index 82083e1b28..0000000000
--- a/scripts/yields.js
+++ /dev/null
@@ -1,84 +0,0 @@
-const { codify } = require('./customTagUtils')
-
-// util
-const maybeAppendContent = (content) => (content ? ` ${content}` : '')
-
-const assertion = (cmd) => {return [
-  `In most cases, ${codify(
-    cmd
-  )} yields the same subject it was given from the previous command.`,
-]}
-
-const sameSubject = (cmd) => {return [
-  `${codify(
-    cmd
-  )} yields the same subject it was given from the previous command.`,
-]}
-
-const changesSubject = (cmd, content) => {return [
-  `${codify(cmd)}${content ? ` ${content}` : ''}`,
-]}
-
-const maybeChangesSubject = (cmd, content) => {return [
-  `${codify(cmd)}${maybeAppendContent(content)}`,
-  `${codify(cmd)} wll not change the subject if ${codify('null')} or ${codify(
-    'undefined'
-  )} is returned.`,
-]}
-
-const setsSubject = (cmd, content) => {return [
-  `${codify(cmd)}${maybeAppendContent(content)}`,
-]}
-
-const changesDomSubject = (cmd) => {return [
-  `${codify(cmd)} yields the new DOM element it found.`,
-]}
-
-const changesDomSubjectOrSubjects = (cmd) => {return [
-  `${codify(cmd)} yields the new DOM element(s) it found.`,
-]}
-
-const setsDomSubject = (cmd) => {return [
-  `${codify(cmd)} yields the DOM element(s) it found.`,
-]}
-
-const yieldsNull = (cmd) => {return [
-  `${codify(cmd)} yields ${codify('null')}.`,
-  `${codify(cmd)} cannot be chained further.`,
-]}
-
-const yieldsAliasableNull = (cmd) => {return [
-  `${codify(cmd)} yields ${codify('null')}.`,
-  `${codify(cmd)} can be aliased, but otherwise cannot be chained further.`,
-]}
-
-const CREATE_YIELDS_LIST_ITEMS_MAP = {
-  same_subject: sameSubject,
-  changes_subject: changesSubject,
-  maybe_changes_subject: maybeChangesSubject,
-  changes_dom_subject: changesDomSubject,
-  changes_dom_subject_or_subjects: changesDomSubjectOrSubjects,
-  sets_dom_subject: setsDomSubject,
-  sets_subject: setsSubject,
-  null: yieldsNull,
-  null_alias: yieldsAliasableNull,
-  assertion_indeterminate: assertion,
-}
-
-/**
- * Creates content that should appear in list items for a given "yields"
- * @returns string[]
- */
-module.exports.createYieldsListItems = (type, cmd, content) => {
-  const buildYieldsListItems = CREATE_YIELDS_LIST_ITEMS_MAP[type]
-
-  if (!buildYieldsListItems) {
-    throw new Error(
-      `{% yields %} tag helper was provided an invalid option: ${type}`
-    )
-  }
-
-  const executedCmd = `${cmd}()`
-
-  return buildYieldsListItems(executedCmd, content)
-}