diff --git a/examples/with-prefetching/README.md b/examples/with-prefetching/README.md
index 4b70ea7777572..6a33e2bf1a748 100644
--- a/examples/with-prefetching/README.md
+++ b/examples/with-prefetching/README.md
@@ -42,5 +42,7 @@ now
 This example features:
 
 - An app with four simple pages
-- The "about" page uses the imperative (i.e.: "manual") prefetching API to prefetch on hover
-- It will prefetch all the pages in the background except the "contact" page
+
+  - Home/Features: Default api
+  - About: Imperative api
+  - Contact: Disable api
diff --git a/examples/with-prefetching/components/Header.js b/examples/with-prefetching/components/Header.js
index c7d000f78d819..d6f34eaa3f51b 100644
--- a/examples/with-prefetching/components/Header.js
+++ b/examples/with-prefetching/components/Header.js
@@ -1,39 +1,47 @@
-import Router from 'next/router'
 import Link from 'next/link'
+import { useRouter } from 'next/router'
 
-export default () => (
-  <div>
-    {/* Prefetch using the declarative API */}
-    <Link prefetch href='/'>
-      <a>Home</a>
-    </Link>
-
-    <Link prefetch href='/features'>
-      <a>Features</a>
-    </Link>
-
-    {/* we imperatively prefetch on hover */}
-    <Link href='/about'>
-      <a
-        onMouseEnter={() => {
-          Router.prefetch('/about')
-          console.log('prefetching /about!')
-        }}
-      >
-        About
-      </a>
-    </Link>
-
-    <Link href='/contact'>
-      <a>
-        Contact (<small>NO-PREFETCHING</small>)
-      </a>
-    </Link>
-
-    <style jsx>{`
-      a {
-        margin-right: 10px;
-      }
-    `}</style>
-  </div>
-)
+export default function Header () {
+  const router = useRouter()
+  return (
+    <div className='root'>
+      <h2>Default</h2>
+      <p>
+        Automatically prefetch pages in the background as soon the Link appears
+        in the view:
+      </p>
+      <Link href='/'>
+        <a>Home</a>
+      </Link>{' '}
+      <Link href='/features'>
+        <a>Features</a>
+      </Link>
+      <h2>Imperative</h2>
+      <p>Prefetch on onMouseEnter or on other events:</p>
+      <Link prefetch={false} href='/about'>
+        <a
+          onMouseEnter={() => {
+            router.prefetch('/about')
+            console.log('prefetching /about!')
+          }}
+        >
+          About
+        </a>
+      </Link>
+      <h2>Disable</h2>
+      <p>Disable prefetching</p>
+      <Link prefetch={false} href='/contact'>
+        <a>Contact</a>
+      </Link>
+      <style jsx>{`
+        .root {
+          border-bottom: 1px solid grey;
+          padding-bottom: 8px;
+        }
+        a {
+          margin-right: 10px;
+        }
+      `}</style>
+    </div>
+  )
+}
diff --git a/examples/with-prefetching/pages/_app.js b/examples/with-prefetching/pages/_app.js
index 60b62e6f16fda..b0ce8eae7735f 100644
--- a/examples/with-prefetching/pages/_app.js
+++ b/examples/with-prefetching/pages/_app.js
@@ -3,16 +3,6 @@ import React from 'react'
 import Header from '../components/Header'
 
 export default class MyApp extends App {
-  static async getInitialProps ({ Component, router, ctx }) {
-    let pageProps = {}
-
-    if (Component.getInitialProps) {
-      pageProps = await Component.getInitialProps(ctx)
-    }
-
-    return { pageProps }
-  }
-
   render () {
     const { Component, pageProps } = this.props
     return (
diff --git a/examples/with-prefetching/pages/about.js b/examples/with-prefetching/pages/about.js
index ae26598fb784b..5112d2563e9af 100644
--- a/examples/with-prefetching/pages/about.js
+++ b/examples/with-prefetching/pages/about.js
@@ -1 +1 @@
-export default () => <p>This is the ABOUT page.</p>
+export default () => <h1>This is the ABOUT page.</h1>
diff --git a/examples/with-prefetching/pages/contact.js b/examples/with-prefetching/pages/contact.js
index 2932f6cbd8b55..0bc89f9b3fe9d 100644
--- a/examples/with-prefetching/pages/contact.js
+++ b/examples/with-prefetching/pages/contact.js
@@ -1 +1 @@
-export default () => <p>This is the CONTACT page.</p>
+export default () => <h1>This is the CONTACT page.</h1>
diff --git a/examples/with-prefetching/pages/features.js b/examples/with-prefetching/pages/features.js
index dc59e799c9f7d..1782964a1f88d 100644
--- a/examples/with-prefetching/pages/features.js
+++ b/examples/with-prefetching/pages/features.js
@@ -1 +1 @@
-export default () => <p>This is the FEATURES page.</p>
+export default () => <h1>This is the FEATURES page.</h1>
diff --git a/examples/with-prefetching/pages/index.js b/examples/with-prefetching/pages/index.js
index b2c6ebfcd4725..a97e0482d792b 100644
--- a/examples/with-prefetching/pages/index.js
+++ b/examples/with-prefetching/pages/index.js
@@ -1 +1 @@
-export default () => <p>This is the HOME page</p>
+export default () => <h1>This is the HOME page</h1>