From d7a4a779b068ee23df635421e725d2c28f18f8f2 Mon Sep 17 00:00:00 2001
From: John Gathogo <john.gathogo@microsoft.com>
Date: Fri, 11 Aug 2023 08:51:53 +0300
Subject: [PATCH] Revert "Revert "Website redesign (#348)" (#354)"

This reverts commit ec804927255ca958e95a0f1c3ff090fca977df55.
---
 .gitignore                                    |    2 +-
 _config.yml                                   |    4 +-
 _data/ecosys-submissions.csv                  |    4 +
 _includes/footer.html                         |   44 +-
 _includes/head.html                           |   54 +-
 _includes/navbar.html                         |   60 +-
 _includes/typing-animation.html               |   62 +
 _layouts/documentation-archived.html          |   24 +
 _libraries/ASP-NET-Web-API-OData.md           |    1 +
 _libraries/Apache-Olingo.md                   |    3 +-
 _libraries/Model-Builder.md                   |   11 +
 _libraries/OData-Client-for-NET.md            |    1 +
 _libraries/ODataCpp-Client.md                 |    3 +-
 _libraries/ODataCpp-Server.md                 |    3 +-
 _libraries/ODataJS.md                         |    3 +-
 _libraries/SDL-OData-Framework.md             |    3 +-
 _tools/OData-CLI.md                           |    7 +
 _tools/OData-Connected-Service.md             |    7 +
 _tools/OData-for-VSCode.md                    |    7 +
 _tools/RAPID-API-Designer.md                  |    8 +
 _tools/RAPID-API-Explorer.md                  |    8 +
 _tools/XOData.md                              |    7 +
 assets/OData-Command-Line-Interface.png       |    3 +
 assets/OData-Connected-Service.png            |    3 +
 assets/api-designer.png                       |    3 +
 assets/api-explorer.png                       |    3 +
 assets/scripts/enterLink.js                   |    5 +
 assets/xodata.png                             |    4 +-
 index.html                                    |  293 ++---
 legacy_pages/contribution.html                |   11 +
 legacy_pages/getting-started.html             |   11 +
 legacy_pages/introduction.html                |    4 +-
 pages/blog.html                               |   51 +-
 pages/contribute.html                         |   19 +
 pages/contribution.html                       |   52 -
 pages/documentation/atom-format-v2.html       |  924 ++++++-------
 pages/documentation/atom-format-v3.html       |    5 +-
 pages/documentation/batch-processing-v2.html  |    5 +-
 pages/documentation/batch-processing-v3.html  |    5 +-
 ...ommon-schema-definition-language-csdl.html |    5 +-
 pages/documentation/documentation.html        |   20 +-
 pages/documentation/json-format-v2.html       |    5 +-
 .../documentation/json-verbose-format-v3.html |    5 +-
 pages/documentation/odata-version-2-0.html    |   26 +-
 .../odata-version-3-0-core-protocol.html      |    7 +-
 pages/documentation/odata-version-3-0.html    |   28 +-
 pages/documentation/operations.html           |   33 +-
 pages/documentation/overview.html             |    5 +-
 pages/documentation/terminology.html          |    5 +-
 pages/documentation/uri-conventions.html      |    5 +-
 pages/documentation/url-conventions.html      |    5 +-
 pages/ecosystem.html                          |  133 +-
 pages/get-started/advanced-tutorial.html      |  783 +++++++++++
 pages/get-started/basic-tutorial.html         | 1163 +++++++++++++++++
 pages/get-started/get-started.html            |   43 +
 .../learning-odata-on-postman.html            |    0
 .../understand-odata-in-6-steps.html          |    0
 pages/getting-started/advanced-tutorial.html  |  751 -----------
 pages/getting-started/basic-tutorial.html     | 1048 ---------------
 pages/getting-started/getting-started.md      |   25 -
 pages/libraries.html                          |  210 +--
 pages/tools.html                              |   20 +
 public/css/site.css                           |  336 ++++-
 63 files changed, 3499 insertions(+), 2889 deletions(-)
 create mode 100644 _data/ecosys-submissions.csv
 create mode 100644 _includes/typing-animation.html
 create mode 100644 _layouts/documentation-archived.html
 create mode 100644 _libraries/Model-Builder.md
 create mode 100644 _tools/OData-CLI.md
 create mode 100644 _tools/OData-Connected-Service.md
 create mode 100644 _tools/OData-for-VSCode.md
 create mode 100644 _tools/RAPID-API-Designer.md
 create mode 100644 _tools/RAPID-API-Explorer.md
 create mode 100644 _tools/XOData.md
 create mode 100644 assets/OData-Command-Line-Interface.png
 create mode 100644 assets/OData-Connected-Service.png
 create mode 100644 assets/api-designer.png
 create mode 100644 assets/api-explorer.png
 create mode 100644 assets/scripts/enterLink.js
 create mode 100644 legacy_pages/contribution.html
 create mode 100644 legacy_pages/getting-started.html
 create mode 100644 pages/contribute.html
 delete mode 100644 pages/contribution.html
 create mode 100644 pages/get-started/advanced-tutorial.html
 create mode 100644 pages/get-started/basic-tutorial.html
 create mode 100644 pages/get-started/get-started.html
 rename pages/{getting-started => get-started}/learning-odata-on-postman.html (100%)
 rename pages/{getting-started => get-started}/understand-odata-in-6-steps.html (100%)
 delete mode 100644 pages/getting-started/advanced-tutorial.html
 delete mode 100644 pages/getting-started/basic-tutorial.html
 delete mode 100644 pages/getting-started/getting-started.md
 create mode 100644 pages/tools.html

diff --git a/.gitignore b/.gitignore
index 398035ef..af4efe3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@ _site
 _config.yml
 .jekyll-cache
 .vs/
-.vscode/
\ No newline at end of file
+.vscode/.jekyll-metadata 
diff --git a/_config.yml b/_config.yml
index 5eb7154d..2ab5f006 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,5 +1,5 @@
 # Site settings
-title: OData - the Best Way to REST
+title: OData - The Best Way to REST
 email: odata-discussion@googlegroups.com
 description: > # this means to ignore newlines until "baseurl:"
   OData, short for Open Data Protocol, is an open protocol
@@ -19,6 +19,8 @@ collections:
   tutorials:
     output: true
     permalink: /tutorials/:title/
+  tools:
+    output: true
 
 permalink: /blog/:title/
 
diff --git a/_data/ecosys-submissions.csv b/_data/ecosys-submissions.csv
new file mode 100644
index 00000000..4a152f9b
--- /dev/null
+++ b/_data/ecosys-submissions.csv
@@ -0,0 +1,4 @@
+id,product_category,product_name,product_link,download_link,brief_description
+2,Producer,test,testingg,,teaowjei aiwjeg oiajweoj gtaow eia weijgoja wiegjawe o
+3,Live Service,test2,https://www.odata.org/,,aweojgawejgjoewijoaw ejgaewg
+4,Consumer,test3,faowje,oaijgoijwe,awiejgoajwegiojawe
diff --git a/_includes/footer.html b/_includes/footer.html
index d8f83069..590d4327 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,7 +1,47 @@
 <footer class="content-info" role="contentinfo">
 
-<div class="container" style=" text-align: center" aria-label="content-info">
-  <p>&copy; 2015-{{ 'now' | date: "%Y" }} OData – The Protocol for REST APIs </p>
+<div class="footer" aria-label="content-info">
+    <div class="container">
+        <div class="items-container centered">
+            <div>
+                <p><strong>Follow</strong></p>
+                <div class="icon-link">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="white" class="bi bi-twitter" viewBox="0 0 16 16">
+                        <path d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z" />
+                    </svg>
+                    <p><a href="https://twitter.com/odataorg">OData Org</a></p>
+                </div>
+            </div>
+            <div>
+                <p><strong>Contact</strong></p>
+                <div class="icon-link">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="white" class="bi bi-envelope-fill" viewBox="0 0 16 16">
+                        <path d="M.05 3.555A2 2 0 0 1 2 2h12a2 2 0 0 1 1.95 1.555L8 8.414.05 3.555ZM0 4.697v7.104l5.803-3.558L0 4.697ZM6.761 8.83l-6.57 4.027A2 2 0 0 0 2 14h12a2 2 0 0 0 1.808-1.144l-6.57-4.027L8 9.586l-1.239-.757Zm3.436-.586L16 11.801V4.697l-5.803 3.546Z" />
+                    </svg>
+                    <p><a href="mailto:odatadev@microsoft.com">odatadev@microsoft.com</a></p>
+                </div>
+            </div>
+            <div>
+                <p><strong>Discuss</strong></p>
+                <div class="icon-link">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="white" class="bi bi-chat-right-text-fill" viewBox="0 0 16 16">
+                        <path d="M16 2a2 2 0 0 0-2-2H2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h9.586a1 1 0 0 1 .707.293l2.853 2.853a.5.5 0 0 0 .854-.353V2zM3.5 3h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1 0-1zm0 2.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1 0-1zm0 2.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1 0-1z" />
+                    </svg>
+                    <p><a href="https://groups.google.com/forum/#!forum/odata-discussion">OData Google Group Forum</a></p>
+                </div>
+            </div>
+            <div>
+                <p><strong>Contribute</strong></p>
+                <div class="icon-link">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="white" class="bi bi-github" viewBox="0 0 16 16">
+                        <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z" />
+                    </svg>
+                    <p><a href="https://github.com/OData">OData Org</a></p>
+                </div>
+            </div>
+        </div>
+        <p>&copy; 2015-{{ 'now' | date: "%Y" }} OData – The Protocol for REST APIs </p>
+    </div>
 </div>
 
 </footer>
diff --git a/_includes/head.html b/_includes/head.html
index 22bd67dc..869fb109 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -1,35 +1,35 @@
 <head>
-  <meta charset="utf-8"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>
-    {% if page.title %}
-      {{ page.title }} &middot; {{ site.title }}
-    {% else %}
-      {{ site.title }}
-    {% endif %}
-  </title>
+    <title>
+        {% if page.title %}
+            {{ page.title }} &middot; {{ site.title }}
+        {% else %}
+            {{ site.title }}
+        {% endif %}
+    </title>
 
-  <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
-  <meta name="keywords" content="odata, open data, open data protocol, rest, restful, rest api, rest apis, restful api, restful apis, rest service, rest services, restful service, restful services, http, oasis, oasis tc">
+    <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
+    <meta name="keywords" content="odata, open data, open data protocol, rest, restful, rest api, rest apis, restful api, restful apis, rest service, rest services, restful service, restful services, http, oasis, oasis tc">
 
-  <script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.0.0.min.js"></script>
-  <script>
-  // Fallback to loading jQuery from a local path if the CDN is unavailable
-  (window.jQuery || document.write('<script src="/public/jquery-3.0.0.min.js"><\/script>'));
-  </script>
-  <!--
-  <script>
-  $(document).ready(function(){
-    $.getJSON("http://ipinfo.io/?callback=?", function(data) {
-      if (data.country=="CN") {
-        $("#GeoResults").html('<embed src="https://player.youku.com/player.php/sid/XMTU5MzU2MDU0NA==/v.swf" allowFullScreen="true" quality="high" width=100% height="230" align="middle" allowScriptAccess="always" type="application/x-shockwave-flash"></embed>');
-      } else $("#GeoResults").html('<iframe width=100% height=230px src="https://www.youtube.com/embed/wH5TUwzlaWI"></iframe>');
+    <script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.0.0.min.js"></script>
+    <script>
+        // Fallback to loading jQuery from a local path if the CDN is unavailable
+        (window.jQuery || document.write('<script src="/public/jquery-3.0.0.min.js"><\/script>'));
+    </script>
+    <!--
+    <script>
+    $(document).ready(function(){
+      $.getJSON("http://ipinfo.io/?callback=?", function(data) {
+        if (data.country=="CN") {
+          $("#GeoResults").html('<embed src="https://player.youku.com/player.php/sid/XMTU5MzU2MDU0NA==/v.swf" allowFullScreen="true" quality="high" width=100% height="230" align="middle" allowScriptAccess="always" type="application/x-shockwave-flash"></embed>');
+        } else $("#GeoResults").html('<iframe width=100% height=230px src="https://www.youtube.com/embed/wH5TUwzlaWI"></iframe>');
+      });
     });
-  });
-  </script>
-  
-  -->
+    </script>
+
+    -->
 
   <link rel="stylesheet" href="{{'/public/css/bootstrap.min.css' | prepend: site.baseurl | prepend: site.url}}">
   <link rel="stylesheet" href="{{'/public/css/site.css' | prepend: site.baseurl | prepend: site.url}}">
diff --git a/_includes/navbar.html b/_includes/navbar.html
index 84aca56b..ea28f565 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -3,17 +3,18 @@
         <p role="presentation">Skip to main content</p>
     </a>
     <nav class="navbar navbar-default" role="navigation" aria-label="Main Navigation">
-        <div class="container container-fluid">
+        <div class="container container-fluid" style="display: flex; align-items: center">
             <div class="navbar-header">
-                <ul class="nav navbar-nav">
-                    <li>
-                        <a class="brand" href="/">
-                            <img class="img-responsive"
-                                 alt="OData logo"
-                                 src="{{'/assets/OData-logo-e1393393068350.png' | prepend: site.baseurl | prepend: site.url}}">
-                        </a>
-                    </li>
-                </ul>
+                <a class="navbar-brand" href="/" style="font-size: 2rem">
+                    <div style="display: flex; align-items: center">
+                        <img class="img-responsive"
+                                alt="OData logo"
+                                width="30"
+                                style="padding-right: 1rem"
+                                src="{{'/assets/ODataLogo-96.png' | prepend: site.baseurl | prepend: site.url}}">
+                        OData
+                    </div>
+                </a>
                 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#odata-navbar-collapse">
                     <span class="sr-only">Toggle navigation</span>
                     <span class="icon-bar"></span>
@@ -22,11 +23,7 @@
                 </button>
             </div>
 
-            <div class="collapse navbar-collapse" id="odata-navbar-collapse" role="navigation">
                 <ul class="nav navbar-nav" role="menubar">
-                    <li role="none">
-                        <a role="menuitem" href="/blog">Blog</a>
-                    </li>
                     <li class="dropdown" role="none">
                         <a role="menuitem"
                            aria-haspopup="true"
@@ -39,7 +36,7 @@
                         </a>
                         <ul class="dropdown-menu" role="menu" aria-label="Developers dropdown.">
                             <li role="none">
-                                <a role="menuitem" href="/getting-started">Getting Started</a>
+                                <a role="menuitem" href="/get-started">Get Started</a>
                             </li>
                             <li role="none">
                                 <a role="menuitem" href="/documentation">Documentation</a>
@@ -56,42 +53,22 @@
                         </ul>
                     </li>
                     <li class="dropdown" role="none">
-                        <a role="menuitem"
-                           aria-haspopup="true"
-                           aria-expanded="false"
-                           class="dropdown-toggle"
-                           data-toggle="dropdown"
-                           data-target="#"
-                           href="#">
-                            Tools <b class="caret"></b>
-                        </a>
-                        <ul class="dropdown-menu" role="menu" aria-label="Tools dropdown.">
-                            <li role="none">
-                                <a role="menuitem"
-                                   href="https://marketplace.visualstudio.com/items?itemName=stansw.vscode-odata"
-                                   target="_blank">
-                                    OData for Visual Studio Code
-                                </a>
-                            </li>
-                            <li role="none">
-                                <a role="menuitem" href="https://pragmatiqa.com/xodata/" target="_blank">XOData</a>
-                            </li>
-                        </ul>
+                        <a role="menuitem" href="/tools">Tools</a>
                     </li>
                     <li role="none">
-                        <a role="menuitem"  href="/ecosystem">Ecosystem</a>
+                        <a role="menuitem" href="/blog">Blog</a>
                     </li>
                     <li role="none">
-                        <a role="menuitem" href="/contribution">Getting Involved</a>
+                        <a role="menuitem" href="/ecosystem">Ecosystem</a>
                     </li>
                 </ul>
 
-                <form class="navbar-form navbar-left" role="search">
-                    <div class="form-group combobox combobox-list">
+                <form class="navbar-form navbar-right search-bar" role="search" style="margin-left: auto">
+                    <div class="search-bar form-group combobox combobox-list">
                         <input id="main-search-input"
                                type="text"
                                aria-label="Search"
-                               class="form-control st-default-search-input"
+                               class="search-bar-input form-control"
                                placeholder="Search"
                                role="combobox"
                                aria-autocomplete="list"
@@ -107,6 +84,5 @@
                     </div>
                 </form>
             </div>
-        </div>
     </nav>
 </div>
diff --git a/_includes/typing-animation.html b/_includes/typing-animation.html
new file mode 100644
index 00000000..0d957197
--- /dev/null
+++ b/_includes/typing-animation.html
@@ -0,0 +1,62 @@
+<div>
+     <p class="typing-animation">
+        <span class="typewrite" data-period="2000" data-type='[ "company/divisions/$count", "company/employees?$select=firstName,lastName", "company?$expand=employees"]'>
+            <span class="wrap"></span>
+        </span>
+    </p>
+
+    <script type="text/javascript">
+        var TxtType = function (el, toRotate, period) {
+            this.toRotate = toRotate;
+            this.el = el;
+            this.loopNum = 0;
+            this.period = parseInt(period, 10) || 2000;
+            this.txt = '';
+            this.tick();
+            this.isDeleting = false;
+        };
+
+        TxtType.prototype.tick = function () {
+            var i = this.loopNum % this.toRotate.length;
+            var fullTxt = this.toRotate[i];
+
+            if (this.isDeleting) {
+                this.txt = '';
+            } else {
+                this.txt = fullTxt.substring(0, this.txt.length + 1);
+            }
+
+            this.el.innerHTML = '<span class="wrap">' + this.txt + '</span>';
+
+            var that = this;
+            var delta = 200 - Math.random() * 100;
+
+            if (this.isDeleting) { delta /= 2; }
+
+            if (!this.isDeleting && this.txt === fullTxt) {
+                delta = this.period;
+                this.isDeleting = true;
+            } else if (this.isDeleting && this.txt === '') {
+                this.isDeleting = false;
+                this.loopNum++;
+                delta = 500;
+            }
+
+            setTimeout(function () {
+                that.tick();
+            }, delta);
+        };
+
+        window.onload = function () {
+            var elements = document.getElementsByClassName('typewrite');
+            for (var i = 0; i < elements.length; i++) {
+                var toRotate = elements[i].getAttribute('data-type');
+                var period = elements[i].getAttribute('data-period');
+                if (toRotate) {
+                    new TxtType(elements[i], JSON.parse(toRotate), period);
+                }
+            }
+
+        };
+    </script>
+</div>
\ No newline at end of file
diff --git a/_layouts/documentation-archived.html b/_layouts/documentation-archived.html
new file mode 100644
index 00000000..adff72b1
--- /dev/null
+++ b/_layouts/documentation-archived.html
@@ -0,0 +1,24 @@
+---
+layout: default
+---
+<div>
+    <div class="container">
+        <div class="page-header">
+            <h1>{{ page.title }}</h1>
+        </div>
+    </div>
+    <div class="banner upgrade">
+        <div class="container">
+            <h2>Upgrade Your OData: Version 4.0 Available!</h2>
+            <p>OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in previous versions.</p>
+            <br />
+            <a class="big-action"
+               href="/documentation/">
+                Latest OData Version
+            </a>
+        </div>
+    </div>
+    <div class="container">
+        {{ content }}
+    </div>
+</div>
\ No newline at end of file
diff --git a/_libraries/ASP-NET-Web-API-OData.md b/_libraries/ASP-NET-Web-API-OData.md
index a4a4ea17..39506664 100644
--- a/_libraries/ASP-NET-Web-API-OData.md
+++ b/_libraries/ASP-NET-Web-API-OData.md
@@ -1,6 +1,7 @@
 ---
 category: net
 name: ASP.NET Web API OData
+featured: true
 rownumber: 40
 link: https://learn.microsoft.com/en-us/odata/webapi/getting-started
 version: V4
diff --git a/_libraries/Apache-Olingo.md b/_libraries/Apache-Olingo.md
index da116502..a005b44f 100644
--- a/_libraries/Apache-Olingo.md
+++ b/_libraries/Apache-Olingo.md
@@ -1,6 +1,7 @@
 ---
 category: java
-name: Apache Olingo <span class="label label-success">featured</span>
+name: Apache Olingo
+featured: true
 rownumber: 13
 version: V2 and V4
 object: Both
diff --git a/_libraries/Model-Builder.md b/_libraries/Model-Builder.md
new file mode 100644
index 00000000..3e3eb33b
--- /dev/null
+++ b/_libraries/Model-Builder.md
@@ -0,0 +1,11 @@
+---
+category: net
+name: Model Builder
+link: https://learn.microsoft.com/en-us/odata/webapi/model-builder-abstract
+version: V1
+object: Server
+downloads:
+  - source: nugetgallery
+    link: https://www.nuget.org/packages/Microsoft.OData.ModelBuilder
+---
+APIs to create an OData Edm (Entity Data Model) using C# types, attributes and conventions.
diff --git a/_libraries/OData-Client-for-NET.md b/_libraries/OData-Client-for-NET.md
index c635b1c9..35425723 100644
--- a/_libraries/OData-Client-for-NET.md
+++ b/_libraries/OData-Client-for-NET.md
@@ -1,6 +1,7 @@
 ---
 category: net
 name: OData Client for .NET
+featured: true
 rownumber: 28
 link: https://odata.github.io/odata.net/#04-01-basic-crud-operations
 version: V4
diff --git a/_libraries/ODataCpp-Client.md b/_libraries/ODataCpp-Client.md
index 91666e4d..9e21bc83 100644
--- a/_libraries/ODataCpp-Client.md
+++ b/_libraries/ODataCpp-Client.md
@@ -1,6 +1,7 @@
 ---
 category: cpp
-name: ODataCpp-Client <span class="label label-success">featured</span>
+name: ODataCpp-Client
+featured: true
 version: V4
 object: Client
 downloads:
diff --git a/_libraries/ODataCpp-Server.md b/_libraries/ODataCpp-Server.md
index 5eed8225..11fc0a25 100644
--- a/_libraries/ODataCpp-Server.md
+++ b/_libraries/ODataCpp-Server.md
@@ -1,6 +1,7 @@
 ---
 category: cpp
-name: ODataCpp-Server <span class="label label-success">featured</span>
+name: ODataCpp-Server
+featured: true
 version: V4
 object: Server
 downloads:
diff --git a/_libraries/ODataJS.md b/_libraries/ODataJS.md
index 712e1f10..825bd29f 100644
--- a/_libraries/ODataJS.md
+++ b/_libraries/ODataJS.md
@@ -1,6 +1,7 @@
 ---
 category: javascript
-name: ODataJS <span class="label label-success">featured</span> 
+name: ODataJS
+featured: true
 rownumber: 25
 version: V4
 object: Client
diff --git a/_libraries/SDL-OData-Framework.md b/_libraries/SDL-OData-Framework.md
index 8b36e662..3962a32a 100644
--- a/_libraries/SDL-OData-Framework.md
+++ b/_libraries/SDL-OData-Framework.md
@@ -1,6 +1,7 @@
 ---
 category: java
-name: SDL OData Frameworks <span class="label label-success">featured</span>
+name: SDL OData Frameworks
+featured: true
 rownumber: 10
 version: V4
 object: Both
diff --git a/_tools/OData-CLI.md b/_tools/OData-CLI.md
new file mode 100644
index 00000000..c8a5df59
--- /dev/null
+++ b/_tools/OData-CLI.md
@@ -0,0 +1,7 @@
+---
+title: OData Command Line Interface
+link: https://www.nuget.org/packages/Microsoft.OData.Cli/
+image-path: /assets/OData-Command-Line-Interface.png
+image-alt: Visual of the command information displayed in the command line.
+---
+The odata-cli is a CLI tool for generating strongly typed C# and Visual Basic client code for a specified OData service. It generates a DataServiceContext class to interact with the service and CLR types for each entity type and complex type in the service model.
diff --git a/_tools/OData-Connected-Service.md b/_tools/OData-Connected-Service.md
new file mode 100644
index 00000000..2bf723a2
--- /dev/null
+++ b/_tools/OData-Connected-Service.md
@@ -0,0 +1,7 @@
+---
+title: OData Connected Service
+link: https://marketplace.visualstudio.com/items?itemName=marketplace.ODataConnectedService
+image-path: /assets/OData-Connected-Service.png
+image-alt: Visual of the extension in action, with new menu items to add a connected service.
+---
+OData Connected Service is a Visual Studio Code extension that generates strongly-typed C# and Visual Basic client code for a specified OData service. It generates a DataServiceContext class to interact with the service and CLR types for each entity type and complex type in the service model.
\ No newline at end of file
diff --git a/_tools/OData-for-VSCode.md b/_tools/OData-for-VSCode.md
new file mode 100644
index 00000000..dad8d593
--- /dev/null
+++ b/_tools/OData-for-VSCode.md
@@ -0,0 +1,7 @@
+---
+title: OData for Visual Studio Code
+link: https://marketplace.visualstudio.com/items?itemName=stansw.vscode-odata
+image-path: /assets/vs_code_for_odata.gif
+image-alt: Visual of the extension in action, providing OData-related suggestions
+---
+OData for Visual Studio Code is a Visual Studio Code extension that adds rich support for the OData query language.
diff --git a/_tools/RAPID-API-Designer.md b/_tools/RAPID-API-Designer.md
new file mode 100644
index 00000000..f6cd472f
--- /dev/null
+++ b/_tools/RAPID-API-Designer.md
@@ -0,0 +1,8 @@
+---
+title: RAPID API Designer
+featured: true
+link: https://rapid.rocks/api-designer/index.html
+image-path: /assets/api-designer.png
+image-alt: API Designer web interface, showing the RSDL Editor, Swagger UI, and request text box
+---
+The RAPID API Designer is a simple application for designing a RAPID API. It allows you to describe your API in simple <a href="https://rapid.rocks/docs/rsdl/rsdl-intro">RAPID Schema Definition Language (RSDL)</a> syntax, view as runtime <a href="https://rapid.rocks/docs/spec/servicedescription">Common Schema Definition Language (CSDL)</a>, Swagger UI, or visually, and build sample queries against the schema.
diff --git a/_tools/RAPID-API-Explorer.md b/_tools/RAPID-API-Explorer.md
new file mode 100644
index 00000000..7dca0724
--- /dev/null
+++ b/_tools/RAPID-API-Explorer.md
@@ -0,0 +1,8 @@
+---
+title: RAPID API Explorer
+featured: true
+link: https://rapid.rocks/api-explorer/index.html
+image-path: /assets/api-explorer.png
+image-alt: API Explorer web interface, showing a request text box and results, as well as CSDL.
+---
+The RAPID API Explorer is a simple application for exploring a RAPID Service. It allows you to explore your services' metadata and build and execute queries against your service.
diff --git a/_tools/XOData.md b/_tools/XOData.md
new file mode 100644
index 00000000..fb26eb0d
--- /dev/null
+++ b/_tools/XOData.md
@@ -0,0 +1,7 @@
+---
+title: XOData
+link: https://pragmatiqa.com/xodata/
+image-path: /assets/xodata.png
+image-alt: XOData interface, showing an entity relationship diagram.
+---
+XOData is a generic online OData API/Service visualizer and explorer. It assists in rapid prototyping, verification, testing, and documentation of OData APIs. With XOData Chrome App it's also possible to explore OData Services deployed locally or on private networks.
diff --git a/assets/OData-Command-Line-Interface.png b/assets/OData-Command-Line-Interface.png
new file mode 100644
index 00000000..922ec28b
--- /dev/null
+++ b/assets/OData-Command-Line-Interface.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3973dab73c5414614294e903600fad9b199a997cbd5b8459443de4ca5eef31db
+size 26081
diff --git a/assets/OData-Connected-Service.png b/assets/OData-Connected-Service.png
new file mode 100644
index 00000000..f7ebb5c9
--- /dev/null
+++ b/assets/OData-Connected-Service.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0581b74343b409b04743c53449d8464ae52cccd85fa7641be324db8723c80f64
+size 23304
diff --git a/assets/api-designer.png b/assets/api-designer.png
new file mode 100644
index 00000000..5f1d83a5
--- /dev/null
+++ b/assets/api-designer.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fc70e07f61074caa87440f2de8831a4492757e6484fc1dd4c86181ff53956e1
+size 215272
diff --git a/assets/api-explorer.png b/assets/api-explorer.png
new file mode 100644
index 00000000..ef9a339c
--- /dev/null
+++ b/assets/api-explorer.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8698deb7e3df948b7a6a5ea713d0ef7af396ae939ab2034419a265d3bfed4b7
+size 150562
diff --git a/assets/scripts/enterLink.js b/assets/scripts/enterLink.js
new file mode 100644
index 00000000..38104648
--- /dev/null
+++ b/assets/scripts/enterLink.js
@@ -0,0 +1,5 @@
+function enterLink(event, url) {
+    if (event.key == "Enter") {
+        document.location.href = url;
+    }
+}
\ No newline at end of file
diff --git a/assets/xodata.png b/assets/xodata.png
index 22814b19..13fb4a0b 100644
--- a/assets/xodata.png
+++ b/assets/xodata.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83cd8efba6a1467ad683f369946023edaa2fe953d2daa60798dac24989b38b37
-size 101357
+oid sha256:53be89a78dda2ea35d36e5a00e44f84797caf595a23182e9d9547d1cf6388711
+size 298561
diff --git a/index.html b/index.html
index e34c32e2..0117dd5c 100644
--- a/index.html
+++ b/index.html
@@ -1,225 +1,110 @@
 ---
 layout: default
 ---
-<div class="container">
-  <div id="myCarousel" class="carousel slide row" data-ride="carousel">
-    <!-- Indicators -->
-    <ol class="carousel-indicators">
-      <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
-      <li data-target="#myCarousel" data-slide-to="1"></li>
-    </ol>
+<script type="text/javascript" src="/assets/scripts/enterLink.js"></script>
 
-    <!-- Wrapper for slides -->
-    <div class="carousel-inner zero-side-margin" aria-label="OData Description" role="listbox">
-      <div class="item active" role="option">
-        <img src="{{ '/assets/homepage_1.jpg' | prepend: site.baseurl | prepend: site.url }}" alt="Home">
-        <div class="carousel-caption jumbotron transparent-background">
-            <h1 class="text-center">OData - the best way to REST</h1>
-            <p class="text-center">An <b>open protocol</b> to allow the creation and consumption of <b>queryable</b> and <b>interoperable RESTful APIs</b> in a <b>simple</b> and <b>standard</b> way.</p>
+<div class="container">
+    <div id="tagline-container">
+        <div class="row" id="tagline" style="margin: 8rem 0 6rem 0">
+            <div>
+                <img class="img-responsive"
+                     alt="OData logo"
+                     src="{{'/assets/ODataLogo-250.png' | prepend: site.baseurl | prepend: site.url}}">
+            </div>
+            <div>
+                <h1>OData</h1>
+                <h2>The best way to REST</h2>
+                <p>An <b>open protocol</b> to allow the creation and consumption of <b>queryable</b> and <b>interoperable RESTful APIs</b> in a <b>simple</b> and <b>standard</b> way.</p>
+                <a class="big-action"
+                        href="/get-started/"
+                        style="margin-top: 1rem">
+                    Get Started
+                </a>
+            </div>
         </div>
-      </div>
-      <div class="item">
-        <img src="{{ '/assets/homepage_2.jpg' | prepend: site.baseurl | prepend: site.url}}" alt="Blog" style="opacity:1.0">
-        <div class="carousel-caption jumbotron" style="background-color: rgba(255,255,255,0.5)">
-            <h1 class="text-center bottom-margin">Recent Posts</h1>
-            <div class="row transparent-background">
-              {% for post in site.posts %}
-                {% if forloop.index < 5 %}
-                <div class="col-md-3 text-left">
-                  <h4><a href='{{post.url}}'>{{post.title}}</a></h4>
-                  By <em>{{ post.author }}</em>
+    </div>
+    <div style="text-align:center; margin: 0 0 8rem 0">
+        {% include typing-animation.html %}
+    </div>
+</div>
+
+<div class="banner">
+    <div class="container">
+        <div class="row" style="margin: 4rem 0 6rem 0">
+            <h3 style="text-align:center; padding:2rem;">Recent Posts</h3>
+            <div class="items-container centered">
+                {% for post in site.posts %}
+                {% if forloop.index < 4 %}
+                <div onclick="location.href='{{post.url}}'">
+                    <p class="recent-post-title"><a href='{{post.url}}'>{{post.title}}</a></p>
+                    <p><em>by {{ post.author }}</em></p>
                 </div>
-                  {% endif %}
+                {% endif %}
                 {% endfor %}
             </div>
         </div>
-      </div>
-
     </div>
+</div>
 
-    <!-- Left and right controls -->
-    <a class="left carousel-control" href="#myCarousel" onclick="$('#myCarousel').carousel('pause');" role="button" data-slide="prev">
-        <svg xmlns="https://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-left" viewBox="0 0 16 16" aria-hidden="true">
-            <path fill-rule="evenodd" d="M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z" />
-        </svg>
-        <span class="sr-only">Previous</span>
-    </a>
-    <a class="right carousel-control" href="#myCarousel" onclick="$('#myCarousel').carousel('pause');" role="button" data-slide="next">
-        <svg xmlns="https://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-right" viewBox="0 0 16 16">
-            <path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z" />
-        </svg>
-        <span class="sr-only">Next</span>
-    </a>
-  </div>
-  <div class="row">
-<!--
-      <div class="col-md-7">
-        <p id="GeoResults"><iframe width=100% height=230px src="https://www.youtube.com/embed/wH5TUwzlaWI"></iframe></p>
-      </div>
-      <div class="col-md-5">
--->
-          <p>OData (Open Data Protocol) is an <a href="https://www.oasis-open.org/news/pr/iso-iec-jtc-1-approves-oasis-odata-standard-for-open-data-exchange">ISO/IEC approved</a>, <a href="https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=odata">OASIS standard</a> that defines a set of best practices for building and consuming RESTful APIs. OData helps you focus on your business logic while building RESTful APIs without having to worry about the various approaches to define request and response headers, status codes, HTTP methods, URL conventions, media types, payload formats, query options, etc. OData also provides guidance for tracking changes, defining functions/actions for reusable procedures, and sending asynchronous/batch requests.</p>
-          <p>OData RESTful APIs are easy to consume. The OData metadata, a machine-readable description of the data model of the APIs, enables the creation of powerful generic client proxies and tools. </p>
-<!--      
-    </div> 
--->
-  </div>
-
-<!--
-  <div id="CustomerQuotation" class="carousel slide row" data-ride="carousel">
-      <ol class="carousel-indicators">
-        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
-        <li data-target="#myCarousel" data-slide-to="1"></li>
-        <li data-target="#myCarousel" data-slide-to="2"></li>
-      </ol>
-
-      <div class="carousel-inner" role="listbox">
-        <div class="item active" style="background-color:orange; color:black; padding:50px;">
-                <h1>"Blah blah blah blah blah"</h1>
-                <h2 class="text-right">-- Author Name, author title, company</h2>
-        </div>
-
-        <div class="item" style="background-color:orange; color:black; padding:50px;">
-          <h1>"Blah blah blah blah blah"</h1>
-          <h2 class="text-right">-- Author Name, author title, company</h2>
-        </div>
-
-        <div class="item" style="background-color:orange; color:black; padding:50px;">
-          <h1>"Blah blah blah blah blah blah blah blah"</h1>
-          <h2 class="text-right">-- Author Name, author title, company</h2>
+<div class="container">
+    <div class="row" style="margin: 4rem 0 6rem 0">
+        <h3 style="text-align:center; padding:2rem;">Featured Tools</h3>
+        <div class="items-container centered" style="flex-wrap:wrap; align-content:space-between">
+            {% assign featuredTools = site.tools | where: "featured", "true" %}
+            {% for tool in featuredTools %}
+            <div class="card" tabindex="0" onkeypress="enterLink(event, '{{tool.link}}')" onclick="location.href='{{tool.link}}'" style="flex-basis:47%">
+                <h4>{{tool.title}}</h4>
+                <img src="{{tool.image-path | prepend: site.baseurl | prepend: site.url}}" alt={{tool.image-alt}} />
+                <p>{{tool.content}}</p>
+            </div>
+            {% endfor %}
         </div>
-
-      </div>
-  </div>
-  <div>
-      <h2 class="text-center">OData has a rich <strong>Ecosystem</strong>. <strong><a href='/ecosystem/'>Click Here</a></strong> to find more!</h2>
-  </div>
--->
-  <!-- customer logos
-  <div class="row icon">
-    <div class="col-md-2">
-      <img src="/assets/ODataLogo-150.png" alt="Icon1">
     </div>
-    <div class="col-md-2">
-      <img src="/assets/ODataLogo-150.png" alt="Icon1">
-    </div>
-    <div class="col-md-2">
-      <img src="/assets/ODataLogo-150.png" alt="Icon1">
-    </div>
-    <div class="col-md-2">
-      <img src="/assets/ODataLogo-150.png" alt="Icon1">
-    </div>
-    <div class="col-md-2">
-      <img src="/assets/ODataLogo-150.png" alt="Icon1">
-    </div>
-    <div class="col-md-2">
-      <img src="/assets/ODataLogo-150.png" alt="Icon1">
-    </div>
-  </div>
--->
-  <div class="row floating-box">
-    <div class="col-md-6 margin-bottom">
-      <h2 class="text-left theme-font">Tools</h2>
-      <table>
-        <tr>
-          <td width="40%"><img src="{{'/assets/vs_code_for_odata.gif' | prepend: site.baseurl | prepend: site.url}}" alt="Visual Studio Code for OData" width = 90%></td>
-          <td>
-            <h3><a href="https://marketplace.visualstudio.com/items?itemName=stansw.vscode-odata ">Visual Studio Code for OData</a></h3>
-            <p>OData for Visual Studio Code is a Visual Studio Code extension that adds rich support for the OData query language</p>
-          </td>
-        </tr>
-        <!--
-          <tr>
-          <td width="40%"><img src="{{'/assets/odata_validator.jpg' | prepend: site.baseurl | prepend: site.url}}" alt="odata_validator" width = 90%></td>
-          <td>
-            <h3><a href="https://services.odata.org/validation/">OData Validator</a></h3>
-            <p>A tool to enable OData service authors to ensure that their service interoperates well with any OData client. It also enables consumers to test OData services.</p>
-          </td>
-        </tr>
-        -->
-        <tr>
-          <td width="40%"><img src="{{'/assets/xodata_tool.jpg' | prepend: site.baseurl | prepend: site.url}}" alt="xodata" width="90%"></td>
-          <td>
-            <h3><a href="https://pragmatiqa.com/xodata/">XOData</a></h3>
-            <p>XOData is a generic online OData API/Service visualizer and explorer. It assists in rapid prototyping, verification, testing, and documentation of OData APIs. With XOData Chrome App it's also possible to explore OData Services deployed locally or on private networks.</p>
-          </td>
-        </tr>
-      </table>
+    <div class="row" style="margin: 4rem 0 6rem 0">
+        <h3 style="text-align:center; padding:2rem;">Featured Libraries</h3>
+        <div class="items-container" style="justify-content:center; flex-wrap:wrap">
+            {% assign libraries = site.libraries | group_by: "category" %}
+            {% for library in libraries %}
+            {% assign featuredItems = library.items | where: "featured", "true" | sort: "rownumber", 'first' | reverse %}
+            {% for item in featuredItems %}
+            <div class="card" tabindex="0" onkeypress="enterLink(event, '{{item.downloads[0].link}}')" onclick="location.href='{{item.downloads[0].link}}'">
+                <h4>{{item.name}}</h4>
+            </div>
+            {% endfor %}
+            {% endfor %}
+        </div>
     </div>
-    <div class="col-md-6">
-      <h2 class="text-left theme-font">Resources</h2>
 
-      <div class="row">
-        <div class="col-md-4">
-          <img src="{{'/assets/howtouse-03.png' | prepend: site.baseurl | prepend: site.url}}" alt="Getting Started" width="120px">
-        </div>
-        <div class="col-md-8">
-          <h4><a href="/getting-started/"> Getting Started </a></h4>
-          <p>To get started, take a look at <a href="/getting-started/understand-odata-in-6-steps/">Understanding OData in 6 steps</a>. And then the <a href="/getting-started/basic-tutorial/">Basic Tutorial</a>, <a href="/getting-started/advanced-tutorial/">Advanced Tutorial</a> and <a href="/getting-started/learning-odata-on-postman/">Postman Tutorial</a> will provide practical samples to learn OData.</p>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-md-4">
-          <img src="{{'/assets/howtouse-01.png' | prepend: site.baseurl | prepend: site.url}}" alt="Documentation" width="120px">
-        </div>
-        <div class="col-md-8">
-          <h4><a href="/documentation/">Standard</a></h4>
-          <p>OData v4 is standardized by OASIS, including <a href="https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part1-protocol.html">Protocol Specification</a>, <a href="https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part2-url-conventions.html">URL Conversions</a>, <a href="https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part3-csdl.html">Common Schema Definition Language</a>, <a href="https://docs.oasis-open.org/odata/odata-json-format/v4.0/odata-json-format-v4.0.html">JSON Format Specification, <a href="https://docs.oasis-open.org/odata/odata/v4.0/errata02/os/complete/abnf/">ABNF</a>, <a href="https://docs.oasis-open.org/odata/odata/v4.0/errata02/os/complete/vocabularies/">Standardized Vocabularies</a>, and <a href="https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/odata-data-aggregation-ext-v4.0.html">Aggregation Extension</a>. OData v4 can also be ordered from ISO/IEC as <a href="https://www.iso.org/iso/catalogue_detail.htm?csnumber=69208">ISO/IEC 20802-1:2016</a> (OData 4.0 Protocol) and <a href="https://www.iso.org/iso/catalogue_detail.htm?csnumber=69209">ISO/IEC 20802-2:2016</a> (OData 4.0 JSON Format)</p>
-        </div>
+    <!--
+      <div id="CustomerQuotation" class="carousel slide row" data-ride="carousel">
+          <ol class="carousel-indicators">
+            <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+            <li data-target="#myCarousel" data-slide-to="1"></li>
+            <li data-target="#myCarousel" data-slide-to="2"></li>
+          </ol>
+          <div class="carousel-inner" role="listbox">
+            <div class="item active" style="background-color:orange; color:black; padding:50px;">
+                    <h1>"Blah blah blah blah blah"</h1>
+                    <h2 class="text-right">-- Author Name, author title, company</h2>
+            </div>
+            <div class="item" style="background-color:orange; color:black; padding:50px;">
+              <h1>"Blah blah blah blah blah"</h1>
+              <h2 class="text-right">-- Author Name, author title, company</h2>
+            </div>
+          </div>
       </div>
-      <div class="row">
-        <div class="col-md-4">
-          <img src="{{'/assets/howtouse-02.png' | prepend: site.baseurl | prepend: site.url}}" alt="Libraries" width="120px">
-        </div>
-        <div class="col-md-8">
-          <h4><a href="/libraries/">Libraries</a></h4>
-          <p>There are several of libraries to facilitate building and consuming OData service. <a href="https://odata.github.io/RESTier/">Restier</a> is the main library for .NET framework. <a href="https://olingo.apache.org/">Apache Olingo</a> is for Java platform to build OData service.</p>
-        </div>
+      <div>
+          <h2 class="text-center">OData has a rich <strong>Ecosystem</strong>. <strong><a href='/ecosystem/'>Click Here</a></strong> to find more!</h2>
       </div>
-      <div class="row">
-        <div class="col-md-4">
-          <img src="{{'/assets/howtouse-04.png' | prepend: site.baseurl | prepend: site.url}}" alt="Presentations" width="120px">
+    -->
+    <!-- customer logos
+      <div class="row icon">
+        <div class="col-md-2">
+          <img src="/assets/ODataLogo-150.png" alt="Icon1">
         </div>
-        <div class="col-md-8">
-          <h4><a href="{{'/odata-services/' | prepend: site.baseurl | prepend: site.url}}">Sample Services</a></h4>
-          <p>There are several OData sample services to help you practice with OData API. <a href="https://services.odata.org/TripPinRESTierService/">TripPin Service</a> is the main sample service.</p>
+        <div class="col-md-2">
+          <img src="/assets/ODataLogo-150.png" alt="Icon1">
         </div>
       </div>
-    </div>
-  </div>
-  </div>
+    -->
 </div>
-
-<script>
-  $(function(){
-    var myCarousel = $("#myCarousel");
-
-    $('#myCarousel.slide').carousel({
-        interval: 5000,
-        pause: "hover"
-    });
-    
-    $('input').focus(function(){
-       myCarousel.carousel('pause');
-    }).blur(function() {
-      myCarousel.carousel('cycle');
-    });
-
-    var carousel = document.getElementById('myCarousel');
-
-    var liveRegion = document.createElement('span');
-    liveRegion.setAttribute('aria-live', 'polite');
-    liveRegion.setAttribute('aria-atomic', 'true');
-    liveRegion.setAttribute('class', 'live-region sr-only');
-    carousel.appendChild(liveRegion);
-
-    var headers = $(myCarousel).find('div.carousel-inner > div > div > h1');
-
-    myCarousel.on('slid.bs.carousel', function () {
-      var activeSlide = $('#myCarousel > div.carousel-inner > div.active > div > h1');
-      var captionText = activeSlide.text();
-      var position =  headers.index(activeSlide) + 1
-      liveRegion.textContent = 'Slide ' + position + ' of ' + headers.length + ' - ' + captionText;
-    });
-});
-</script>
diff --git a/legacy_pages/contribution.html b/legacy_pages/contribution.html
new file mode 100644
index 00000000..0754237f
--- /dev/null
+++ b/legacy_pages/contribution.html
@@ -0,0 +1,11 @@
+---
+layout: page
+title: Community
+date: 2023-03-06
+permalink: /contribution/
+---
+
+<div class="jumbotron">
+    <h2>Information on how to contribute has been moved to the footer on every page</h2>
+    <a href="/"><h3><span class="glyphicon glyphicon-arrow-right"></span> Go home</h3></a>
+</div>
\ No newline at end of file
diff --git a/legacy_pages/getting-started.html b/legacy_pages/getting-started.html
new file mode 100644
index 00000000..68069ea8
--- /dev/null
+++ b/legacy_pages/getting-started.html
@@ -0,0 +1,11 @@
+---
+layout: page
+title: "It's moved..."
+date: 2023-03-06
+permalink: /getting-started/
+---
+
+<div class="jumbotron">
+    <h2>This page has been moved to the Get Started page</h2>
+    <a href="/get-started/"><h3><span class="glyphicon glyphicon-arrow-right"></span> Go to the page</h3></a>
+</div>
\ No newline at end of file
diff --git a/legacy_pages/introduction.html b/legacy_pages/introduction.html
index d6df3cd8..1d766049 100644
--- a/legacy_pages/introduction.html
+++ b/legacy_pages/introduction.html
@@ -6,6 +6,6 @@
 ---
 
 <div class="jumbotron">
-  <h2>This page has been moved to the Getting Started page</h2>
-  <a href="/getting-started/"><h3><span class="glyphicon glyphicon-arrow-right"></span> Go to the page</h3></a>
+  <h2>This page has been moved to the Get Started page</h2>
+  <a href="/get-started/"><h3><span class="glyphicon glyphicon-arrow-right"></span> Go to the page</h3></a>
 </div>
\ No newline at end of file
diff --git a/pages/blog.html b/pages/blog.html
index a358e05a..fe920a1d 100644
--- a/pages/blog.html
+++ b/pages/blog.html
@@ -3,23 +3,34 @@
 title: Blog
 permalink: /blog/
 ---
-
-{% for post in site.posts %}
-  {% if forloop.index < 5 %}
-  <div class='post'>   
-    <h3><a href='{{post.url}}'>{{post.title}}</a></h3>
-    <span class='date'><em>{{post.date | date_to_string}} &nbsp;&nbsp; {{ post.author }}</em></span>
-    <br><br>
-    <p>{{ post.content | strip_html | truncatewords: 50 }}</p>
-  </div>
-
-  {% else %}
-    {% if forloop.index == 5 %}
-    <h2>Older Posts</h2>
-    <table>
-    {% endif %}
-    <h3><a href='{{post.url}}'>{{post.title}}</a></h3>
-    <span class='date'><em>{{post.date | date_to_string}} &nbsp;&nbsp; {{ post.author }}</em></span>
-  {% endif %}
-{% endfor %}
-</table>
\ No newline at end of file
+<script type="text/javascript" src="/assets/scripts/enterLink.js"></script>
+<div class="row">
+<div class="col-md-10" style="padding-bottom:9px; margin:0 0 20px">
+    <p>Below, find a collection of blog posts documenting the life of OData and its uses since 2010. For some of our most recent posts and tutorials about the .NET implementation of OData, we encourage you to check out the Microsoft blog.</p>
+    <p>We also welcome community contributions! Add your own post by creating a pull request on our GitHub page.</p>
+    <div style="display:flex; justify-content: center; gap: 2rem; border-bottom:1px solid #eeeeee">
+        <a class="big-action"
+           href="https://devblogs.microsoft.com/odata/"
+           style="margin-top:2rem; margin-bottom: 2rem;">
+            Microsoft Blog
+        </a>
+        <a class="big-action"
+           href="https://github.com/OData/odataorg.github.io"
+           style="margin-top:2rem; margin-bottom: 2rem;">
+            Contribute
+        </a>
+    </div>
+</div>
+<div class="col-md-10">
+    <div class="card-column main-content">
+        {% for post in site.posts %}
+        <div class="card" tabindex="0" onkeypress="enterLink(event, '{{post.url}}')" onclick="location.href='{{post.url}}'">
+            <h2>{{post.title}}</h2>
+            <span class='date'>{{post.date | date_to_string}} &nbsp;&#8226;&nbsp; {{ post.author }}</span>
+            <br><br>
+            <p>{{ post.content | strip_html | truncatewords: 50 }}</p>
+        </div>
+        {% endfor %}
+    </div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pages/contribute.html b/pages/contribute.html
new file mode 100644
index 00000000..b90784d2
--- /dev/null
+++ b/pages/contribute.html
@@ -0,0 +1,19 @@
+---
+layout: page
+title: Contribute
+date: 2023-03-14
+<!--permalink: /contribute/-->
+---
+
+Want to add/update information of the OData ecosystem and libraries? You can edit and submit changes on the page's <a href="https://github.com/ODataOrg/odataorg.github.io" target="_blank">Github repository</a>, or simply fill out the form below to add a new ecosystem listing.
+
+<iframe width="750px" 
+        height="480px"  
+        src="https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR_Cxq9CY_MFJh0CSbDKC80BUQ0lHUElPNVY3MUdaQlJMVFhaVjdDTk1MUC4u&embed=true" 
+        frameborder="0" 
+        marginwidth="0" 
+        marginheight="0" 
+        style="border: none; max-width:100%; max-height:100vh; margin-top:2rem" 
+        allowfullscreen webkitallowfullscreen mozallowfullscreen msallowfullscreen
+> 
+</iframe>
\ No newline at end of file
diff --git a/pages/contribution.html b/pages/contribution.html
deleted file mode 100644
index 675b8184..00000000
--- a/pages/contribution.html
+++ /dev/null
@@ -1,52 +0,0 @@
----
-layout: page
-title: Community
-permalink: /contribution/
----
-
-
-<h2 class="text-center" >Contribute to OData.org</h2>
-<div class="row" style="height:auto; text-align:center">
-
-<div>
-		<p class="text-center">OData.org is always open to any kind of contribution, including <strong>Post blogs</strong>, adding contents to <strong>Ecosystem</strong>, <strong>Libraries</strong> and <strong>other improvements </strong>. Please visit OData.org repo on GitHub for more details. Or if you have any further questions / feedback, please create <a href="https://github.com/ODataOrg/odataorg.github.io/issues">GitHub issues</a> or send email to <a href="mailto:odata-discussion@googlegroups.com">odata-discussion@googlegroups.com</a>.</p>
-</div>
-</div>
-
-
-<h2 class="text-center">Participate elsewhere</h2>
-<div class="row text-center">
-
-	<div>
-		<p class="text-center">You can also view issues and discuss OData in other communities. You can participate or follow the standardization technical committee progress at OASIS, ask questions at StackOverflow and tweet #OData at Twitter.</p>
-	</div>
-		<div class="col-md-6">
-		<a href="https://groups.google.com/forum/#!forum/odata-discussion"><img src="/assets/OASIS.png" height="125px" alt="OASIS OData Discussion" ></a></div>
-<!-- 		<div class="col-md-4">
-		<a href="https://stackoverflow.com/questions/ask?tags=odata"><img src="/assets/StackOverflow.png" height="125px" ></a></div> -->
-		<div class="col-md-6">
-		<a href="https://twitter.com/odataorg"><img src="/assets/Twitter.png" alt="Odata twitter" height="125px" ></a></div>
-</div>
-
-<h2 class="text-center">Join discussion groups</h2>
-<div class="row text-center">
-	<div>
-		<p class="text-center">Join the new mailing list for OData discussion. You can ask or answer questions about the OData protocol.</p>
-	</div>
-	<div class="col-md-6">
-		<a href="https://groups.google.com/forum/#!forum/odata-discussion"><img src="/assets/ODataDiscussionGroup.png" alt="Odata Discussion" height="125px"></a>
-	</div>
-	<div class="col-md-6">
-		<a href="https://olingo.apache.org/support.html"><img src="/assets/ApacheOlingoSupport.png" alt="Apache Olingo Support" height="125px" ></a>
-	</div>
-</div>			
-
-<h2 class="text-center">Contact us</h2>
-<div class="row text-center">
-	<div>
-		<p class="text-center">Contact us directly about any suggestion or advice for OData.org.</p>
-	</div>
-	<div class="col-md-12">
-		<a href="mailto:odatadev@microsoft.com"><img src="/assets/MSODataTeam.png" alt="Microsoft OData Team" height="125px"></a>
-	</div>
-</div>			
\ No newline at end of file
diff --git a/pages/documentation/atom-format-v2.html b/pages/documentation/atom-format-v2.html
index 37e87cd2..f2cdd078 100644
--- a/pages/documentation/atom-format-v2.html
+++ b/pages/documentation/atom-format-v2.html
@@ -1,12 +1,9 @@
 ---
-layout: page
+layout: documentation-archived
 title: Atom Format (OData Version 2.0)
 date: 2014-02-28 03:35:17.000000000 +08:00
 permalink: /documentation/odata-version-2-0/atom-format/
 ---
-<p class="alert alert-success">OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in OData Version 2.0. 
-<br><br>
-<a href="/documentation/" class="alert-link" title=""><span class="glyphicon glyphicon-arrow-right"></span> Go to OData Version 4.0</a></p>
 <h2>Introduction</h2>
 <p>OData supports two formats for representing the resources (Collections, Entries, Links, etc) it exposes: the XML-based Atom format and the JSON format. This document describes how OData resources are represented in Atom (plus additional elements defined in AtomPub) and <a href="../json-format">[OData-JSON]</a> describes the JSON representation. The <a href="../operations#RepresentationFormatAndContentTypeNegotiation"> content type negotiation</a> section of the <a href="../operations">[OData-Operations]</a> document describes how clients can use standard HTTP content type negotiation to tell an OData service which format it wants to use.</p>
 <h2>1. Background</h2>
@@ -15,444 +12,454 @@ <h2>1. Background</h2>
 <p>It should be noted that feeds following the conventions defined in this document are valid AtomPub feeds and can be consumed by feed readers, tools, etc. which are only aware of the Atom standards ([RFC4287] &amp; [RFC5023]), but not the additional conventions defined in this document.</p>
 <h2>2. Atom Representations</h2>
 <p>The following sections define how resources (Collection, Entries, etc) exposed by an OData service can be represented in requests and responses payloads using the Atom format. For details regarding how to create various request types (Retrieve, Create, etc) see <a href="../operations">[OData-Operations]</a> .</p>
-<p>Through out this section the notation <atom:elementName> is used to refer to the named element in the Atom <a href="https://tools.ietf.org/html/rfc4287">[RFC4287]</a> specification.</p>
+<p>Through out this section the notation <atom:elementName> is used to refer to the named element in the Atom <a href="https://tools.ietf.org/html/rfc4287">[RFC4287]</a> specification.</atom:elementName></p>
 <h3>2.1. Primitive Types</h3>
 <p>Values of OData primitive types are represented as values of XML elements/attributes as per the table below. Note: The type system used by OData services is described in full in the <a href="../overview#AbstractTypeSystem">primitive types</a> section of the <a href="../overview">[OData-Core]</a> document. In addition to the rules stated in the table, if the value of a primitive type is null, then it is represented as an empty XML element with an <strong>m:null="true"</strong> attribute ("m" identifies the OData metadata namespace).</p>
 <div>
-<table border="0">
-<tbody>
-<tr>
-<th>Primitive Type</th>
-<th>Serialization Format in XML Documents</th>
-</tr>
-<tr>
-<td>Edm.Binary</td>
-<td>Base64 encoded value of an EDM.Binary value. See <a href="https://go.microsoft.com/fwlink/?LinkId=90432"> [RFC3548]</a> .</td>
-</tr>
-<tr>
-<td>Edm.Boolean</td>
-<td>true | false</td>
-</tr>
-<tr>
-<td>Edm.Byte</td>
-<td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a>, except without the surrounding</td>
-</tr>
-<tr>
-<td>Edm.DateTime</td>
-<td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a>, except without the surrounding datetime'' syntax</td>
-</tr>
-<tr>
-<td>Edm.Decimal</td>
-<td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a>, except without the trailing "m"</td>
-</tr>
-<tr>
-<td>Edm.Double</td>
-<td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a></td>
-</tr>
-<tr>
-<td>Edm.Guid</td>
-<td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a>, except without the surrounding guid'' syntax</td>
-</tr>
-<tr>
-<td>Edm.Int16</td>
-<td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a></td>
-</tr>
-<tr>
-<td>Edm.Int32</td>
-<td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a></td>
-</tr>
-<tr>
-<td>Edm.Int64</td>
-<td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a></td>
-</tr>
-<tr>
-<td>Edm.SByte</td>
-<td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a></td>
-</tr>
-<tr>
-<td>Edm.Single</td>
-<td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a>, except without the trailing "f"</td>
-</tr>
-<tr>
-<td>Edm.String</td>
-<td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a>, except without surrounding double quotes</td>
-</tr>
-<tr>
-<td>Edm.Time</td>
-<td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a>, except without the surrounding time'' syntax</td>
-</tr>
-<tr>
-<td>Edm.DateTimeOffset</td>
-<td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a>, except without the surrounding datetimeoffset'' syntax</td>
-</tr>
-</tbody>
-</table>
+    <table border="0">
+        <tbody>
+            <tr>
+                <th>Primitive Type</th>
+                <th>Serialization Format in XML Documents</th>
+            </tr>
+            <tr>
+                <td>Edm.Binary</td>
+                <td>Base64 encoded value of an EDM.Binary value. See <a href="https://go.microsoft.com/fwlink/?LinkId=90432"> [RFC3548]</a> .</td>
+            </tr>
+            <tr>
+                <td>Edm.Boolean</td>
+                <td>true | false</td>
+            </tr>
+            <tr>
+                <td>Edm.Byte</td>
+                <td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a>, except without the surrounding</td>
+            </tr>
+            <tr>
+                <td>Edm.DateTime</td>
+                <td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a>, except without the surrounding datetime'' syntax</td>
+            </tr>
+            <tr>
+                <td>Edm.Decimal</td>
+                <td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a>, except without the trailing "m"</td>
+            </tr>
+            <tr>
+                <td>Edm.Double</td>
+                <td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a></td>
+            </tr>
+            <tr>
+                <td>Edm.Guid</td>
+                <td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a>, except without the surrounding guid'' syntax</td>
+            </tr>
+            <tr>
+                <td>Edm.Int16</td>
+                <td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a></td>
+            </tr>
+            <tr>
+                <td>Edm.Int32</td>
+                <td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a></td>
+            </tr>
+            <tr>
+                <td>Edm.Int64</td>
+                <td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a></td>
+            </tr>
+            <tr>
+                <td>Edm.SByte</td>
+                <td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a></td>
+            </tr>
+            <tr>
+                <td>Edm.Single</td>
+                <td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a>, except without the trailing "f"</td>
+            </tr>
+            <tr>
+                <td>Edm.String</td>
+                <td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a>, except without surrounding double quotes</td>
+            </tr>
+            <tr>
+                <td>Edm.Time</td>
+                <td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a>, except without the surrounding time'' syntax</td>
+            </tr>
+            <tr>
+                <td>Edm.DateTimeOffset</td>
+                <td>Same as the <a href="../overview#AbstractTypeSystem">literal form in [OData:Core]</a>, except without the surrounding datetimeoffset'' syntax</td>
+            </tr>
+        </tbody>
+    </table>
 </div>
 <h3>2.2. Service Documents</h3>
 <p>As described in <a href="../overview">[OData-Core]</a>, if a service exposes several Collections, then to aid discovery of those Collections by clients it is useful for the service to expose a Service Document which lists the available Collections. Service Documents are described in AtomPub <a href="https://tools.ietf.org/html/rfc5023#page-15"> [RFC5023], section 15</a>.</p>
 <p>For example, the URI <a href="https://services.odata.org/OData/OData.svc">https://services.odata.org/OData/OData.svc</a> identifies the Service Document of a sample OData service which exposes a Categories, Products and Suppliers Collection. For convenience, a sample Service Document is shown in the listing below.</p>
-{% highlight xml %}<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 
-<service xml:base="https://services.odata.org/OData/OData.svc/" 
-         xmlns:atom="https://www.w3.org/2005/Atom" 
-         xmlns:app="https://www.w3.org/2007/app" 
+{% highlight xml %}
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<service xml:base="https://services.odata.org/OData/OData.svc/"
+         xmlns:atom="https://www.w3.org/2005/Atom"
+         xmlns:app="https://www.w3.org/2007/app"
          xmlns="https://www.w3.org/2007/app">
-  <workspace>
-    <atom:title>Default</atom:title> 
-    <collection href="Products">
-      <atom:title>Products</atom:title> 
-    </collection>
-    <collection href="Categories">
-      <atom:title>Categories</atom:title> 
-    </collection>
-    <collection href="Suppliers">
-      <atom:title>Suppliers</atom:title> 
-    </collection>
-  </workspace>
+    <workspace>
+        <atom:title>Default</atom:title>
+        <collection href="Products">
+            <atom:title>Products</atom:title>
+        </collection>
+        <collection href="Categories">
+            <atom:title>Categories</atom:title>
+        </collection>
+        <collection href="Suppliers">
+            <atom:title>Suppliers</atom:title>
+        </collection>
+    </workspace>
 </service>{% endhighlight %}
 <h3>2.3. Representing Collections of Entries</h3>
-<p><a href="../terminology#Collection">Collections</a> represent a set of <a href="../terminology#Entry">Entries</a>. In OData, Collections are represented as Atom feeds ([RFC5023] ), with one Atom entry for each Entry within the Collection. For example, a Collection of product category Entries (that could be part of a product catalog) exposed by an OData service, as identified by the URI <a href="https://services.odata.org/OData/OData.svc/Categories">https://services.odata.org/OData/OData.svc/Categories</a>, is represented as shown below. The format of <atom:entry> elements within a feed is described in the <a href="../atom-format#RepresentingEntries">Representing Entries</a> section.</p>
+<p><a href="../terminology#Collection">Collections</a> represent a set of <a href="../terminology#Entry">Entries</a>. In OData, Collections are represented as Atom feeds ([RFC5023] ), with one Atom entry for each Entry within the Collection. For example, a Collection of product category Entries (that could be part of a product catalog) exposed by an OData service, as identified by the URI <a href="https://services.odata.org/OData/OData.svc/Categories">https://services.odata.org/OData/OData.svc/Categories</a>, is represented as shown below. The format of <atom:entry> elements within a feed is described in the <a href="../atom-format#RepresentingEntries">Representing Entries</a> section.</atom:entry></p>
 <p><strong>Note</strong>: The "m" and "d" prefixes represent the OData metadata and data namespaces. It is likely the next version of OData will generalize the namespace URI to use an odata.org based URI.</p>
 
 <strong>OData V1:</strong>
 {% highlight xml %}
 
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <feed xml:base=https://services.odata.org/OData/OData.svc/
-     xmlns:d=http://schemas.microsoft.com/ado/2007/08/dataservices
-     xmlns:m=http://schemas.microsoft.com/ado/2007/08/dataservices/metadata
-     xmlns="https://www.w3.org/2005/Atom">
-  <title type="text">Categories</title>
-  <id>https://services.odata.org/OData/OData.svc/Categories</id>
-  <updated>2010-03-10T08:38:14Z</updated>
-  <link rel="self" title="Categories" href="Categories" />
-  <entry>
-    <id>https://services.odata.org/OData/OData.svc/Categories(0)</id>
-    <title type="text">Food</title>
+      xmlns:d=http://schemas.microsoft.com/ado/2007/08/dataservices
+      xmlns:m=http://schemas.microsoft.com/ado/2007/08/dataservices/metadata
+      xmlns="https://www.w3.org/2005/Atom">
+    <title type="text">Categories</title>
+    <id>https://services.odata.org/OData/OData.svc/Categories</id>
     <updated>2010-03-10T08:38:14Z</updated>
-    <author>
-      <name />
-    </author>
-    <link rel="edit" title="Category" href="Categories(0)" />
-    <link 
-        rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Products"
-        type="application/atom+xml;type=feed"
-        title="Products" href="Categories(0)/Products" />
-    <category term="ODataDemo.Category"
-        scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
-    <content type="application/xml">
-      <m:properties>
-        <d:ID m:type="Edm.Int32">0</d:ID>
-        <d:Name>Food</d:Name>
-      </m:properties>
-    </content>
-  </entry>
-  <!-- <entry> elements representing additional Categories go here -->
+    <link rel="self" title="Categories" href="Categories" />
+    <entry>
+        <id>https://services.odata.org/OData/OData.svc/Categories(0)</id>
+        <title type="text">Food</title>
+        <updated>2010-03-10T08:38:14Z</updated>
+        <author>
+            <name />
+        </author>
+        <link rel="edit" title="Category" href="Categories(0)" />
+        <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Products"
+              type="application/atom+xml;type=feed"
+              title="Products" href="Categories(0)/Products" />
+        <category term="ODataDemo.Category"
+                  scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+        <content type="application/xml">
+            <m:properties>
+                <d:ID m:type="Edm.Int32">0</d:ID>
+                <d:Name>Food</d:Name>
+            </m:properties>
+        </content>
+    </entry>
+    <!-- <entry> elements representing additional Categories go here -->
 </feed>{% endhighlight %}
 <p>In response payloads only, OData v2 supports two pieces of collection-level metadata: an Entry count (the total count of the number of entities in the Collection) and "next links" in the case when a partial listing of the Collection of Entries is being represented.</p>
-<p>The Entry count, is only included in the feed returned by an OData service when the request URI includes the $inlinecount System Query Option. In this case, the count information is represented as a <m:count> element with the value of the element being the total number of Entries in the Collection. See the <a href="../uri-conventions#InlinecountSystemQueryOption"> $inlinecount section</a> of the <a href="../uri-conventions">[OData-URI]</a> document for a description of how the count value is calculated.</p>
-<p>In response payloads only, if the server does not include an <entry> element for every Entry in the Collection identified by the request URI (typically for resource conservation reasons), then the returned feed represents a partial listing as defined in AtomPub <a href="https://tools.ietf.org/html/rfc5023#section-10.1">[RFC5023] section 10.1</a>. In this case, the response includes a <link rel="next" href="…"> element to indicate the feed is a partial listing and to provide the URI of the next partial list feed so a client can easily continue obtaining additional entries. Version Note: Partial lists of Entries are supported in OData V2.0 only. For more information on interacting with partial listings, see <a href="../operations#RetrievingFeedsEntriesAndServiceDocuments"> Retrieving feeds, entries and service documents</a> in the <a href="../operations">[OData-Operations]</a> document.</p>
-<strong>OData V2:</strong> 
+<p>The Entry count, is only included in the feed returned by an OData service when the request URI includes the $inlinecount System Query Option. In this case, the count information is represented as a <m:count> element with the value of the element being the total number of Entries in the Collection. See the <a href="../uri-conventions#InlinecountSystemQueryOption"> $inlinecount section</a> of the <a href="../uri-conventions">[OData-URI]</a> document for a description of how the count value is calculated.</m:count></p>
+<p>In response payloads only, if the server does not include an <entry> element for every Entry in the Collection identified by the request URI (typically for resource conservation reasons), then the returned feed represents a partial listing as defined in AtomPub <a href="https://tools.ietf.org/html/rfc5023#section-10.1">[RFC5023] section 10.1</a>. In this case, the response includes a <link rel="next" href="…" /> element to indicate the feed is a partial listing and to provide the URI of the next partial list feed so a client can easily continue obtaining additional entries. Version Note: Partial lists of Entries are supported in OData V2.0 only. For more information on interacting with partial listings, see <a href="../operations#RetrievingFeedsEntriesAndServiceDocuments"> Retrieving feeds, entries and service documents</a> in the <a href="../operations">[OData-Operations]</a> document.</entry></p>
+<strong>OData V2:</strong>
 {% highlight xml %}
 
 <feed xml:base="https://services.odata.org/Northwind/Northwind.svc/"
-        xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
-        xmlns:m=http://schemas.microsoft.com/ado/2007/08/dataservices/metadata
-        xmlns="https://www.w3.org/2005/Atom">
-  <title type="text">Customers</title> 
-  <id>https://services.odata.org/Northwind/Northwind.svc/Customers</id> 
-  <updated>2010-03-10T09:34:11Z</updated> 
-  <link rel="self" title="Customers" href="Customers" /> 
-  <strong><m:count>91</m:count></strong> 
-  <entry>
-    <id>https://services.odata.org/Northwind/Northwind.svc/Customers('ALFKI')</id> 
-    <title type="text" /> 
-    <updated>2010-03-10T09:34:11Z</updated> 
-    <author>
-      <name /> 
-    </author>
-    <link rel="edit" title="Customer" href="Customers('ALFKI')" /> 
-    <link 
-        rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"
-        type="application/atom+xml;type=feed"
-        title="Orders" href="Customers('ALFKI')/Orders" />
-    <link 
-  rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/CustomerDemographics"
-  type="application/atom+xml;type=feed"
-  title="CustomerDemographics" href="Customers('ALFKI')/CustomerDemographics" /> 
-    <category term="NorthwindModel.Customer"
-        scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /> 
-    <content type="application/xml">
-      <m:properties>
-        <d:CustomerID>ALFKI</d:CustomerID> 
-        <d:CompanyName>Alfreds Futterkiste</d:CompanyName> 
-        <d:ContactName>Maria Anders</d:ContactName> 
-        <d:ContactTitle>Sales Representative</d:ContactTitle> 
-        <d:Address>Obere Str. 57</d:Address> 
-        <d:City>Berlin</d:City> 
-        <d:Region m:null="true" /> 
-        <d:PostalCode>12209</d:PostalCode> 
-        <d:Country>Germany</d:Country> 
-        <d:Phone>030-0074321</d:Phone> 
-        <d:Fax>030-0076545</d:Fax> 
-      </m:properties>
-    </content>
-  </entry>
-  <!-- <entry> elements representing additional customers goes here -->
-  <strong><link rel="next" 
-      href="https://services.odata.org/Northwind/Northwind.svc/Customers?
-    $inlinecount=allpages&amp;$skiptoken='ERNSH'" /> </strong>
+      xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
+      xmlns:m=http://schemas.microsoft.com/ado/2007/08/dataservices/metadata
+      xmlns="https://www.w3.org/2005/Atom">
+    <title type="text">Customers</title>
+    <id>https://services.odata.org/Northwind/Northwind.svc/Customers</id>
+    <updated>2010-03-10T09:34:11Z</updated>
+    <link rel="self" title="Customers" href="Customers" />
+    <strong><m:count>91</m:count></strong>
+    <entry>
+        <id>https://services.odata.org/Northwind/Northwind.svc/Customers('ALFKI')</id>
+        <title type="text" />
+        <updated>2010-03-10T09:34:11Z</updated>
+        <author>
+            <name />
+        </author>
+        <link rel="edit" title="Customer" href="Customers('ALFKI')" />
+        <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"
+              type="application/atom+xml;type=feed"
+              title="Orders" href="Customers('ALFKI')/Orders" />
+        <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/CustomerDemographics"
+              type="application/atom+xml;type=feed"
+              title="CustomerDemographics" href="Customers('ALFKI')/CustomerDemographics" />
+        <category term="NorthwindModel.Customer"
+                  scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+        <content type="application/xml">
+            <m:properties>
+                <d:CustomerID>ALFKI</d:CustomerID>
+                <d:CompanyName>Alfreds Futterkiste</d:CompanyName>
+                <d:ContactName>Maria Anders</d:ContactName>
+                <d:ContactTitle>Sales Representative</d:ContactTitle>
+                <d:Address>Obere Str. 57</d:Address>
+                <d:City>Berlin</d:City>
+                <d:Region m:null="true" />
+                <d:PostalCode>12209</d:PostalCode>
+                <d:Country>Germany</d:Country>
+                <d:Phone>030-0074321</d:Phone>
+                <d:Fax>030-0076545</d:Fax>
+            </m:properties>
+        </content>
+    </entry>
+    <!-- <entry> elements representing additional customers goes here -->
+    <strong>
+        <link rel="next"
+              href="https://services.odata.org/Northwind/Northwind.svc/Customers?
+    $inlinecount=allpages&amp;$skiptoken='ERNSH'" />
+    </strong>
 </feed>{% endhighlight %}
 <h3>2.4. Representing Entries</h3>
-<p>In OData, Entries are represented as Atom <atom:entry> elements with all the <a href="../terminology#Property">Properties</a> of the Entry represented as elements within the <m:properties> element which is a direct child of the <atom:content> element. When using an OData v2 server, clients may indicate that they want a subset of the properties by using the Select System Query Option in the request.</p>
-<p>If the Entry being represented links to other Entries via <a href="../terminology#NavigationProperty"> Navigation Properties</a> (e.g. a Product is related to a Category), then the Links are represented as <atom:link rel= <a href="http://schemas.microsoft.com/ado/2007/08/dataservices/related/%5bNavigationPropertyName%5d"> http://schemas.microsoft.com/ado/2007/08/dataservices/related/[NavigationPropertyName]</a> href=â€â€¦"/> elements â€" one for each Navigation Property of the Entry.</p>
+<p>In OData, Entries are represented as Atom <atom:entry> elements with all the <a href="../terminology#Property">Properties</a> of the Entry represented as elements within the <m:properties> element which is a direct child of the <atom:content> element. When using an OData v2 server, clients may indicate that they want a subset of the properties by using the Select System Query Option in the request.</atom:content></m:properties></atom:entry></p>
+<p>If the Entry being represented links to other Entries via <a href="../terminology#NavigationProperty"> Navigation Properties</a> (e.g. a Product is related to a Category), then the Links are represented as <atom:link rel=rel <a href="http://schemas.microsoft.com/ado/2007/08/dataservices/related/%5bNavigationPropertyName%5d"> http://schemas.microsoft.com/ado/2007/08/dataservices/related/[NavigationPropertyName]</a> href=â€â€¦"/> elements â€" one for each Navigation Property of the Entry.</p>
 <p>Metadata describing the Entry being represented can be specified using additional Atom-defined and OData-defined elements/attributes as defined by the following list.</p>
-<p><strong><atom:id></strong></p>
+<p><strong><atom:id></atom:id></strong></p>
 <ul>
-<li>As per <a href="https://tools.ietf.org/html/rfc4287">[RFC4287]</a>, contains a URI which uniquely identifies the Entry</li>
+    <li>As per <a href="https://tools.ietf.org/html/rfc4287">[RFC4287]</a>, contains a URI which uniquely identifies the Entry</li>
 </ul>
-<p><strong><atom:category scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"></strong></p>
+<p><strong><atom:category scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"></atom:category></strong></p>
 <ul>
-<li>This element may be present with a term attribute whose value indicates the Entity Type in the <a href="../overview#AbstractDataModel">data model</a> of the OData service that describes the Entry represented by the parent <atom:entry> element. An <atom:Entry> must contain at most one such category element with the specified scheme.</li>
-<li>To ensure type fidelity across of Entries sent from server to client (and vice versa), this element must be included if the Entry is part of a type hierarchy and is not the base type in the hierarchy.</li>
-<li>The value of the element is the namespace qualified name of the <a href="../overview#AbstractDataModel"> Entity Type</a> in the <a href="../terminology#ServiceMetadataDocument"> Service Metadata Document</a> that describes the Entry.</li>
-<li>When this element is not present clients and servers should assume that the entry is of the base type of the containing collection, if that information is known. When a collection can contain a number of types within a inheritance hierarchy servers will typically reject requests that contain Entries without type information.</li>
+    <li>This element may be present with a term attribute whose value indicates the Entity Type in the <a href="../overview#AbstractDataModel">data model</a> of the OData service that describes the Entry represented by the parent <atom:entry> element. An <atom:Entry> must contain at most one such category element with the specified scheme.</atom:Entry></atom:entry></li>
+    <li>To ensure type fidelity across of Entries sent from server to client (and vice versa), this element must be included if the Entry is part of a type hierarchy and is not the base type in the hierarchy.</li>
+    <li>The value of the element is the namespace qualified name of the <a href="../overview#AbstractDataModel"> Entity Type</a> in the <a href="../terminology#ServiceMetadataDocument"> Service Metadata Document</a> that describes the Entry.</li>
+    <li>When this element is not present clients and servers should assume that the entry is of the base type of the containing collection, if that information is known. When a collection can contain a number of types within a inheritance hierarchy servers will typically reject requests that contain Entries without type information.</li>
 </ul>
-<p><strong><atom:link rel="self" href=".." ></strong></p>
+<p><strong><atom:link rel="self" href=".."></atom:link></strong></p>
 <ul>
-<li>As per <a href="https://tools.ietf.org/html/rfc4287">[RFC4287]</a>, this element is optional. If included it contains the URI a client should use to retrieve the Entry as described in <a href="../operations">[OData-Operations]</a> .</li>
+    <li>As per <a href="https://tools.ietf.org/html/rfc4287">[RFC4287]</a>, this element is optional. If included it contains the URI a client should use to retrieve the Entry as described in <a href="../operations">[OData-Operations]</a> .</li>
 </ul>
-<p><strong><atom:link rel="edit" href=" .. " ></strong></p>
+<p><strong><atom:link rel="edit" href=" .. "></atom:link></strong></p>
 <ul>
-<li>As per <a href="https://tools.ietf.org/html/rfc5023">[RFC5023]</a>, this element should be included. If included it contains the URI a client should use to update or delete the Entry as defined in <a href="../operations">[OData-Operations]</a> .</li>
+    <li>As per <a href="https://tools.ietf.org/html/rfc5023">[RFC5023]</a>, this element should be included. If included it contains the URI a client should use to update or delete the Entry as defined in <a href="../operations">[OData-Operations]</a> .</li>
 </ul>
 <p><strong>m:etag attribute</strong></p>
 <ul>
-<li>An attribute in the OData Metadata Namespace whose value is the <a href="../operations#ConcurrencyControlAndETags"> concurrency token</a> associated with the Entry. The value is formatted as required by the ETag header in [RFC2616].</li>
-<li>This attribute should be present in a response from an OData service when returning a feed (i.e. multiple Entries in a single HTTP response), otherwise the HTTP ETag response header should be used to communicate the concurrency token of the resource returned to a client.</li>
+    <li>An attribute in the OData Metadata Namespace whose value is the <a href="../operations#ConcurrencyControlAndETags"> concurrency token</a> associated with the Entry. The value is formatted as required by the ETag header in [RFC2616].</li>
+    <li>This attribute should be present in a response from an OData service when returning a feed (i.e. multiple Entries in a single HTTP response), otherwise the HTTP ETag response header should be used to communicate the concurrency token of the resource returned to a client.</li>
 </ul>
 <p>For example, as shown in the following listing, the Category Entry identified by the URI <a href="https://services.odata.org/OData/OData.svc/Categories%280%29">https://services.odata.org/OData/OData.svc/Categories(0)</a>, has two primitive properties (ID &amp; Name) and one Navigation Property named “Productsâ€, which identifies a feed of Product Entries related to the Category.</p>
-{% highlight xml %}<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 
-<entry xml:base="https://services.odata.org/OData/OData.svc/" 
-       xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" 
-       xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" 
+{% highlight xml %}
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<entry xml:base="https://services.odata.org/OData/OData.svc/"
+       xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
+       xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
        xmlns="https://www.w3.org/2005/Atom">
-  <id>https://services.odata.org/OData/OData.svc/Categories(0)</id> 
-  <title type="text">Food</title> 
-  <updated>2010-03-10T10:43:51Z</updated> 
-  <author>
-    <name /> 
-  </author>
-  <link rel="edit" title="Category" href="Categories(0)" /> 
-  <strong><link 
-      rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Products"
-      type="application/atom+xml;type=feed" title="Products" 
-      href="Categories(0)/Products" /></strong> 
-  <category term="ODataDemo.Category" 
-      scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /> 
-  <strong><content type="application/xml"> 
-    <m:properties> 
-      <d:ID m:type="Edm.Int32">0</d:ID>
-      <d:Name>Food</d:Name> 
-    </m:properties> 
-  </content></strong>
+    <id>https://services.odata.org/OData/OData.svc/Categories(0)</id>
+    <title type="text">Food</title>
+    <updated>2010-03-10T10:43:51Z</updated>
+    <author>
+        <name />
+    </author>
+    <link rel="edit" title="Category" href="Categories(0)" />
+    <strong>
+        <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Products"
+              type="application/atom+xml;type=feed" title="Products"
+              href="Categories(0)/Products" />
+    </strong>
+    <category term="ODataDemo.Category"
+              scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <strong>
+        <content type="application/xml">
+            <m:properties>
+                <d:ID m:type="Edm.Int32">0</d:ID>
+                <d:Name>Food</d:Name>
+            </m:properties>
+        </content>
+    </strong>
 </entry>{% endhighlight %}
 <h4>2.4.1. Deferred Content</h4>
 <p>To conserve resources (bandwidth, CPU, and so on), it is generally not a good idea for an OData service to return the full graph of Entries related to the Entry (or Collection of entries) identified in a request URI. For example, an OData service should defer sending related Entries unless the client explicitly asked for them using the <a href="../uri-conventions#ExpandSystemQueryOption">$expand System Query Option</a> which provides a way for a client to state related entities should be <a href="../atom-format#InlineRepresentationofAssociatedEntries">represented inline</a>.</p>
 <p>As shown in the example in the prior section, by default properties which represent <a href="../terminology#Link">Links</a> (the "Products" property in the example) are represented as a <link rel=" <strong> </strong> http://schemas.microsoft.com/ado/2007/08/dataservices/related/[NavigationPropertyName]" href="..." /> element to indicate the service deferred representing the related Entries. If needed, a client can then use the URI in the href attribute in a subsequent retrieve request to obtain the related Entries.</p>
 <h4>2.4.2. Inline Representation of Associated Entries</h4>
 <p>As described in the <a href="../uri-conventions#ExpandSystemQueryOption"> $expand System Query Option section</a> of the <a href="../uri-conventions">[OData-URI]</a> document, a request URI may include the $expand query option to explicitly request that a linked to Entry or collection of Entries be serialized inline, rather than deferred.</p>
-<p>In this case the related Entry or collection of Entries is represented as the child element of an <m:inline> element as an <atom:feed> or <atom:entry> respectively. For example, a single Category Entry with its related Product Entries serialized inline is represented as shown in the example below.</p>
-{% highlight xml %}<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<p>In this case the related Entry or collection of Entries is represented as the child element of an <m:inline> element as an <atom:feed> or <atom:entry> respectively. For example, a single Category Entry with its related Product Entries serialized inline is represented as shown in the example below.</atom:entry></atom:feed></m:inline></p>
+{% highlight xml %}
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <entry xml:base=https://services.odata.org/OData/OData.svc/"
-   xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
-   xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
-   xmlns="https://www.w3.org/2005/Atom">
-  <id>https://services.odata.org/OData/OData.svc/Categories(0)</id>
-  <title type="text">Food</title>
-  <updated>2010-03-11T06:40:04Z</updated>
-  <author>
-    <name />
-  </author>
-  <link rel="edit" title="Category" href="Categories(0)" />
-  <link 
-      rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Products" 
-      type="application/atom+xml;type=feed" 
-       title="Products" href="Categories(0)/Products">
-    <strong><m:inline></strong>
-      <feed>
+       xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
+       xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
+       xmlns="https://www.w3.org/2005/Atom">
+    <id>https://services.odata.org/OData/OData.svc/Categories(0)</id>
+    <title type="text">Food</title>
+    <updated>2010-03-11T06:40:04Z</updated>
+    <author>
+        <name />
+    </author>
+    <link rel="edit" title="Category" href="Categories(0)" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Products"
+          type="application/atom+xml;type=feed"
+          title="Products" href="Categories(0)/Products" />
+    <strong><m:inline></m:inline></strong>
+    <feed>
         <title type="text">Products</title>
         <id>https://services.odata.org/OData/OData.svc/Categories(0)/Products</id>
         <updated>2010-03-11T06:40:04Z</updated>
         <link rel="self" title="Products" href="Categories(0)/Products" />
         <entry>
-          <id>https://services.odata.org/OData/OData.svc/Products(0)</id>
-          <title type="text">Bread</title>
-          <summary type="text">Whole grain bread</summary>
-          <updated>2010-03-11T06:40:04Z</updated>
-          <author>
-            <name />
-          </author>
-          <link rel="edit" title="Product" href="Products(0)" />
-          <link 
-              rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Category" 
-              type="application/atom+xml;type=entry" 
-              title="Category" href="Products(0)/Category" />
-          <link 
-              rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Supplier" 
-              type="application/atom+xml;type=entry" 
-              title="Supplier" href="Products(0)/Supplier" />
-          <category term="ODataDemo.Product" 
-              scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
-          <content type="application/xml">
-            <m:properties>
-              <d:ID m:type="Edm.Int32">0</d:ID>
-              <d:ReleaseDate m:type="Edm.DateTime">1992-01-01T00:00:00</d:ReleaseDate>
-              <d:DiscontinuedDate m:type="Edm.DateTime" m:null="true" />
-              <d:Rating m:type="Edm.Int32">4</d:Rating>
-              <d:Price m:type="Edm.Decimal">2.5</d:Price>
-            </m:properties>
-          </content>
+            <id>https://services.odata.org/OData/OData.svc/Products(0)</id>
+            <title type="text">Bread</title>
+            <summary type="text">Whole grain bread</summary>
+            <updated>2010-03-11T06:40:04Z</updated>
+            <author>
+                <name />
+            </author>
+            <link rel="edit" title="Product" href="Products(0)" />
+            <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Category"
+                  type="application/atom+xml;type=entry"
+                  title="Category" href="Products(0)/Category" />
+            <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Supplier"
+                  type="application/atom+xml;type=entry"
+                  title="Supplier" href="Products(0)/Supplier" />
+            <category term="ODataDemo.Product"
+                      scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+            <content type="application/xml">
+                <m:properties>
+                    <d:ID m:type="Edm.Int32">0</d:ID>
+                    <d:ReleaseDate m:type="Edm.DateTime">1992-01-01T00:00:00</d:ReleaseDate>
+                    <d:DiscontinuedDate m:type="Edm.DateTime" m:null="true" />
+                    <d:Rating m:type="Edm.Int32">4</d:Rating>
+                    <d:Price m:type="Edm.Decimal">2.5</d:Price>
+                </m:properties>
+            </content>
         </entry>
-      </feed>
+    </feed>
     <strong></m:inline></strong>
-  </link>
-  <category term="ODataDemo.Category"
-     scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
-  <content type="application/xml">
-    <m:properties>
-      <d:ID m:type="Edm.Int32">0</d:ID>
-      <d:Name>Food</d:Name>
-    </m:properties>
-  </content>
+    </link>
+    <category term="ODataDemo.Category"
+              scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <content type="application/xml">
+        <m:properties>
+            <d:ID m:type="Edm.Int32">0</d:ID>
+            <d:Name>Food</d:Name>
+        </m:properties>
+    </content>
 </entry>{% endhighlight %}
 <h4> 2.4.3. Representing Media Link Entries</h4>
-<p><a href="../terminology#MediaLinkEntry">Media Link Entries (MLE)</a> are represented in the same way as regular Entries as described in <a href="../atom-format#RepresentingEntries"> Representing Entries</a>; however, they also contain additional metadata per Entry that describes the Media Resource (MR) associated with the Entry and the <m:properties> element becomes a child of the <atom:entry> element. The <m:properties> element is moved out from under the <atom:content> element because in the case of an MLE, the content describes the MR.</p>
-<p>This additional MR-specific metadata is represented by the following constructs in the <atom:entry>:</p>
-<ul>
-<li><strong><link rel="edit-media" href="{MediaResourceUri}"></strong>
+<p><a href="../terminology#MediaLinkEntry">Media Link Entries (MLE)</a> are represented in the same way as regular Entries as described in <a href="../atom-format#RepresentingEntries"> Representing Entries</a>; however, they also contain additional metadata per Entry that describes the Media Resource (MR) associated with the Entry and the <m:properties> element becomes a child of the <atom:entry> element. The <m:properties> element is moved out from under the <atom:content> element because in the case of an MLE, the content describes the MR.</atom:content></m:properties></atom:entry></m:properties></p>
+<p>This additional MR-specific metadata is represented by the following constructs in the <atom:entry>:</atom:entry></p>
 <ul>
-<li>As per <a href="https://tools.ietf.org/html/rfc5023#section-9.6">[RFC5023] section 9.6</a>, this element indicates the URI a client should use to update or delete the Media Resource, as described in <a href="../operations">[OData-Operations]</a> .</li>
-<li>If the ETag of the Media Resource (MR) is independent from that of the Media Link Entry (MLE), then this element should include an m:etag attribute with value equal to the concurrency token of the MR.</li>
-</ul>
-</li>
-<li><strong><atom:content src="{MediaResourceUri}" type="{MimeType}"></strong>
-<ul>
-<li>For MLE's, this element describes the associated MR. The value of the src attribute is the URI a client should use to retrieve the Media Resource, as described in <a href="../operations">[OData-Operations]</a>. Note: this allows a Media Resource to have independent links for editing and retrieval.</li>
-<li>The value of the type attribute is the mime type of the MR.</li>
-</ul>
-</li>
+    <li>
+        <strong><link rel="edit-media" href="{MediaResourceUri}" /></strong>
+        <ul>
+            <li>As per <a href="https://tools.ietf.org/html/rfc5023#section-9.6">[RFC5023] section 9.6</a>, this element indicates the URI a client should use to update or delete the Media Resource, as described in <a href="../operations">[OData-Operations]</a> .</li>
+            <li>If the ETag of the Media Resource (MR) is independent from that of the Media Link Entry (MLE), then this element should include an m:etag attribute with value equal to the concurrency token of the MR.</li>
+        </ul>
+    </li>
+    <li>
+        <strong><atom:content src="{MediaResourceUri}" type="{MimeType}"></atom:content></strong>
+        <ul>
+            <li>For MLE's, this element describes the associated MR. The value of the src attribute is the URI a client should use to retrieve the Media Resource, as described in <a href="../operations">[OData-Operations]</a>. Note: this allows a Media Resource to have independent links for editing and retrieval.</li>
+            <li>The value of the type attribute is the mime type of the MR.</li>
+        </ul>
+    </li>
 </ul>
 <h4>2.4.4. Customizing the Representation of an Entry</h4>
-<p>Services may wish to have more flexibility over how Entries are represented within an <atom:entry> element. For example, a service may want to enable the value of a property of an Entry be represented as the value of one of the standard Atom elements (Title, Summary, etc) or as the value of a custom element within an Entry. OData supports services that need this kind of control over the Atom representations of an Entry.</p>
-<p>In general a service may choose to deviate from the conventions defined in Representing Entries section above and represent the value of a Property of an Entry as the value of a standard Atom element (Title, Summary, etc) or as the value of an element in a custom namespace. When a service does this form of customization it breaks the shared assumption between client and server regarding how Entries are encoded within an <atom:entry> element. OData services that deviate from the prescribed encoding should expose a <a href="../terminology#ServiceMetadataDocument"> Service Metadata Document</a> that include Feed Customization annotations which allow a client to discover how the server chose to encode a given Entry within the <atom:entry> element. The remainder of this section describes the set of Feed Customization annotations that may be used.</p>
+<p>Services may wish to have more flexibility over how Entries are represented within an <atom:entry> element. For example, a service may want to enable the value of a property of an Entry be represented as the value of one of the standard Atom elements (Title, Summary, etc) or as the value of a custom element within an Entry. OData supports services that need this kind of control over the Atom representations of an Entry.</atom:entry></p>
+<p>In general a service may choose to deviate from the conventions defined in Representing Entries section above and represent the value of a Property of an Entry as the value of a standard Atom element (Title, Summary, etc) or as the value of an element in a custom namespace. When a service does this form of customization it breaks the shared assumption between client and server regarding how Entries are encoded within an <atom:entry> element. OData services that deviate from the prescribed encoding should expose a <a href="../terminology#ServiceMetadataDocument"> Service Metadata Document</a> that include Feed Customization annotations which allow a client to discover how the server chose to encode a given Entry within the <atom:entry> element. The remainder of this section describes the set of Feed Customization annotations that may be used.</atom:entry></atom:entry></p>
 <p>The following table lists all the Feed Customization annotations defined in OData.</p>
 <div>
-<table border="0">
-<tbody>
-<tr>
-<th>Feed Customization Annotation</th>
-<th>Description</th>
-</tr>
-<tr>
-<td valign="top">FC_SourcePath</td>
-<td>The name of the Property on an Entry which this feed mapping rule applies to.The format of this parameter is a path expression where property names are separated by a <strong>/</strong> character. For example for a Person Entry with an integer Property <strong>Age</strong> and an <strong>Address</strong> Complex Type Property, the following are legal values for this property:</p>
-<p>- Age</p>
-<p>- Address/Street</p>
-<p>The following are invalid values for this property:</p>
-<p>- Foo (not a defined property)</p>
-<p>- Address (doesn't identify a primitive property)</p>
-<p>- Address/Street/ (cannot end with a /)</p>
-<p>- Empty string or null</p>
-<p>- /Address/Street (cannot start with a /)</td>
-</tr>
-<tr>
-<td valign="top">FC_TargetPath</td>
-<td>The name of the element to map the property identified by the FC_SourcePath annotation to. If no FC_SourcePath annotation is specified, then this annotation must be on a <Property> element in the Service Metadata Document which itself identifies the source Property.The format of this annotation is a path expression where nested elements are separated by a / and attributes are specified by a @ symbol.</p>
-<p>For example, to map to a property value to a custom XML element or attribute:</p>
-<p>To map the source Property to a custom <Category> element which is a direct child of the <atom:entry> element use:</p>
-<p>- FC_TargetPath="Category"</p>
-<p>To map the source Property to an attribute named Term on a custom <Category> element which is a direct child of the <atom:entry> element:</p>
-<p>- FC_TargetPath="Category/@Term"</p>
-<p>To map the source Property to a child element of the custom <Category> element named <Foo>, where <Category> is a direct child of the <atom:entry> element:</p>
-<p>- FC_TargetPath="Category/Foo"</p>
-<p>This annotation also supports mapping to Atom-defined elements. This following list describes the values used to map to Atom-defined elements:</p>
-<p>Format: value : mapped to atom element</p>
-<ul>
-<li>"SyndicationAuthorEmail" : <author><email></li>
-<li>"SyndicationAuthorName" : <author><name></li>
-<li>"SyndicationAuthorUri" : <author><uri></li>
-<li>"SyndicationPublished" : <published></li>
-<li>"SyndicationRights" : <rights></li>
-<li>"SyndicationSummary" : <summary></li>
-<li>"SyndicationTitle" : <title></li>
-</ul>
-<p><a id="_GoBack" name="_GoBack"></a></p>
-<p>Note: This annotation does not support mapping to multiple instances of an element, so two overlapping path definitions imply the same element instances. For example: the target path values <strong>a/b/c</strong> and <strong>a/d/f</strong> imply the following XML structure: <a><b> <c/></b><d><f/></d></td>
-</tr>
-<tr>
-<td valign="top">FC_ContentKind</td>
-<td>The mime type of the source Property</td>
-</tr>
-<tr>
-<td valign="top">FC_NsPrefix</td>
-<td>When the source Property is being mapped to an element that is not in the Atom namespace, the value of this annotation specifies the namespace prefix to use the Atom document for target element.</td>
-</tr>
-<tr>
-<td valign="top">FC_NsUri</td>
-<td>When a property is being mapped to an element that is not in the Atom namespace, this annotation is used to specify the namespace for the target element. The FC_NSPrefix annotation specifies the namespace prefix for the namespace specified by this annotation.</td>
-</tr>
-<tr>
-<td valign="top">FC_KeepInContent</td>
-<td>The value of this property is true if the property being mapped should appear both in its “mapped to†location as well as within the content section of the <entry>.If the value of this property is false, then the property being mapped should only appear in its new “mapped to†location in the <entry> and NOT also in the content section. This value (false) is only supported in OData v2.0 and requires that any response formatted in this way return a DataServiceVersion:2.0 response header.</td>
-</tr>
-</tbody>
-</table>
+    <table border="0">
+        <tbody>
+            <tr>
+                <th>Feed Customization Annotation</th>
+                <th>Description</th>
+            </tr>
+            <tr>
+                <td valign="top">FC_SourcePath</td>
+                <td>
+                    The name of the Property on an Entry which this feed mapping rule applies to.The format of this parameter is a path expression where property names are separated by a <strong>/</strong> character. For example for a Person Entry with an integer Property <strong>Age</strong> and an <strong>Address</strong> Complex Type Property, the following are legal values for this property:</p>
+                    <p>- Age</p>
+                    <p>- Address/Street</p>
+                    <p>The following are invalid values for this property:</p>
+                    <p>- Foo (not a defined property)</p>
+                    <p>- Address (doesn't identify a primitive property)</p>
+                    <p>- Address/Street/ (cannot end with a /)</p>
+                    <p>- Empty string or null</p>
+                    <p>- /Address/Street (cannot start with a /)</p>
+                </td>
+            </tr>
+            <tr>
+                <td valign="top">FC_TargetPath</td>
+                <td>
+                    The name of the element to map the property identified by the FC_SourcePath annotation to. If no FC_SourcePath annotation is specified, then this annotation must be on a <Property>
+                        element in the Service Metadata Document which itself identifies the source Property.The format of this annotation is a path expression where nested elements are separated by a / and attributes are specified by a @ symbol.</p>
+                        <p>For example, to map to a property value to a custom XML element or attribute:</p>
+                        <p>To map the source Property to a custom <Category> element which is a direct child of the <atom:entry> element use:</atom:entry></Category></p>
+                        <p>- FC_TargetPath="Category"</p>
+                        <p>To map the source Property to an attribute named Term on a custom <Category> element which is a direct child of the <atom:entry> element:</atom:entry></Category></p>
+                        <p>- FC_TargetPath="Category/@Term"</p>
+                        <p>To map the source Property to a child element of the custom <Category> element named <Foo>, where <Category> is a direct child of the <atom:entry> element:</atom:entry></Category></Foo></Category></p>
+                        <p>- FC_TargetPath="Category/Foo"</p>
+                        <p>This annotation also supports mapping to Atom-defined elements. This following list describes the values used to map to Atom-defined elements:</p>
+                        <p>Format: value : mapped to atom element</p>
+                        <ul>
+                            <li>"SyndicationAuthorEmail" : <author><email></email></author></li>
+                            <li>"SyndicationAuthorName" : <author><name></name></author></li>
+                            <li>"SyndicationAuthorUri" : <author><uri></uri></author></li>
+                            <li>"SyndicationPublished" : <published></published></li>
+                            <li>"SyndicationRights" : <rights></rights></li>
+                            <li>"SyndicationSummary" : <summary></summary></li>
+                            <li>"SyndicationTitle" : <title></title></li>
+                        </ul>
+                        <p><a id="_GoBack" name="_GoBack"></a></p>
+                        <p>Note: This annotation does not support mapping to multiple instances of an element, so two overlapping path definitions imply the same element instances. For example: the target path values <strong>a/b/c</strong> and <strong>a/d/f</strong> imply the following XML structure: <a><b> <c /></b><d><f /></d></a></p>
+                    </Property>
+                </td>
+            </tr>
+            <tr>
+                <td valign="top">FC_ContentKind</td>
+                <td>The mime type of the source Property</td>
+            </tr>
+            <tr>
+                <td valign="top">FC_NsPrefix</td>
+                <td>When the source Property is being mapped to an element that is not in the Atom namespace, the value of this annotation specifies the namespace prefix to use the Atom document for target element.</td>
+            </tr>
+            <tr>
+                <td valign="top">FC_NsUri</td>
+                <td>When a property is being mapped to an element that is not in the Atom namespace, this annotation is used to specify the namespace for the target element. The FC_NSPrefix annotation specifies the namespace prefix for the namespace specified by this annotation.</td>
+            </tr>
+            <tr>
+                <td valign="top">FC_KeepInContent</td>
+                <td>The value of this property is true if the property being mapped should appear both in its “mapped to†location as well as within the content section of the <entry>.If the value of this property is false, then the property being mapped should only appear in its new “mapped to†location in the <entry> and NOT also in the content section. This value (false) is only supported in OData v2.0 and requires that any response formatted in this way return a DataServiceVersion:2.0 response header.</entry></entry></td>
+            </tr>
+        </tbody>
+    </table>
 </div>
-<p>For example, the sample Service Metadata Document at https://services.odata.org/OData/OData.svc/$metadata states the Name Property of the Category Entry is represented as the value of the <atom:title> element. Since FC_KeepInContent is equals true for this mapping the value is duplicated within the <m:properties> element.</p>
-{% highlight xml %}<strong>Snippet from Service Metadata Document</strong> 
+<p>For example, the sample Service Metadata Document at https://services.odata.org/OData/OData.svc/$metadata states the Name Property of the Category Entry is represented as the value of the <atom:title> element. Since FC_KeepInContent is equals true for this mapping the value is duplicated within the <m:properties> element.</m:properties></atom:title></p>
+{% highlight xml %}<strong>Snippet from Service Metadata Document</strong>
 <EntityType Name="Category">
-  <Key>
-    <PropertyRef Name="ID" />
-  </Key>
-  <Property Name="ID" Type="Edm.Int32" Nullable="false" />
-  <Property Name="Name" Type="Edm.String" 
-            Nullable="true" 
-            <strong>m:FC_TargetPath="SyndicationTitle" m:FC_ContentKind="text" 
+    <Key>
+        <PropertyRef Name="ID" />
+    </Key>
+    <Property Name="ID" Type="Edm.Int32" Nullable="false" />
+    <Property Name="Name" Type="Edm.String"
+              Nullable="true"
+            <strong>m:FC_TargetPath="SyndicationTitle" m:FC_ContentKind="text"
             m:FC_KeepInContent="true"</strong> />
-  <NavigationProperty Name="Products" 
-                      Relationship="ODataDemo.Product_Category_Category_Products" 
+  <NavigationProperty Name="Products"
+                      Relationship="ODataDemo.Product_Category_Category_Products"
                       FromRole="Category_Products" ToRole="Product_Category" />
 </EntityType>
 
-<strong>Category representation in Atom</strong> 
+<strong>Category representation in Atom</strong>
 (see https://services.odata.org/OData/OData.svc/Categories(0) )
 
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <entry xml:base="https://services.odata.org/(S(S_ODATA_RO))/OData/OData.svc/"
-    xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
-    xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
-    xmlns="https://www.w3.org/2005/Atom">
-  <id>https://services.odata.org/(S(S_ODATA_RO))/OData/OData.svc/Categories(0)</id>
-  <strong><title type="text">Food</title></strong>
-  <updated>2010-03-11T22:28:51Z</updated>
-  <author>
-    <name />
-  </author>
-  <link rel="edit" title="Category" href="Categories(0)" />
-  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Products" 
-      type="application/atom+xml;type=feed" 
-      title="Products" 
-      href="Categories(0)/Products" />
-  <category term="ODataDemo.Category" 
-      scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
-  <content type="application/xml">
-    <m:properties>
-      <d:ID m:type="Edm.Int32">0</d:ID>
-      <strong><d:Name>Food</d:Name></strong>
-    </m:properties>
-  </content>
+       xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
+       xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
+       xmlns="https://www.w3.org/2005/Atom">
+    <id>https://services.odata.org/(S(S_ODATA_RO))/OData/OData.svc/Categories(0)</id>
+    <strong><title type="text">Food</title></strong>
+    <updated>2010-03-11T22:28:51Z</updated>
+    <author>
+        <name />
+    </author>
+    <link rel="edit" title="Category" href="Categories(0)" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Products"
+          type="application/atom+xml;type=feed"
+          title="Products"
+          href="Categories(0)/Products" />
+    <category term="ODataDemo.Category"
+              scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <content type="application/xml">
+        <m:properties>
+            <d:ID m:type="Edm.Int32">0</d:ID>
+            <strong><d:Name>Food</d:Name></strong>
+        </m:properties>
+    </content>
 </entry>{% endhighlight %}
-<p>If the Category Entry in the example above was part of a type hierarchy and the Name property was defined on the type Category derives from, then the mapping from Name to <atom:title> is still possible, however the placement of the annotation changes to be on the <EntityType> element in the Service Metadata Document as shown in the following listing.</p>
+<p>If the Category Entry in the example above was part of a type hierarchy and the Name property was defined on the type Category derives from, then the mapping from Name to <atom:title> is still possible, however the placement of the annotation changes to be on the <EntityType> element in the Service Metadata Document as shown in the following listing.</EntityType></atom:title></p>
 {% highlight xml %}<EntityType Name="Category" <strong>m:FC_TargetPath="SyndicationTitle" m:FC_SourcePath="Name"
   m:FC_ContentKind="text" m:FC_KeepInContent="true"</strong>
                             BaseType:"Sample.BaseCategory">
@@ -460,75 +467,74 @@ <h4>2.4.4. Customizing the Representation of an Entry</h4>
     <PropertyRef Name="ID" />
   </Key>
   <Property Name="ID" Type="Edm.Int32" Nullable="false" />
-  <NavigationProperty Name="Products" 
-                      Relationship="ODataDemo.Product_Category_Category_Products" 
+  <NavigationProperty Name="Products"
+                      Relationship="ODataDemo.Product_Category_Category_Products"
                       FromRole="Category_Products" ToRole="Product_Category" />
 </EntityType>{% endhighlight %}
-<p>Instead of mapping the Name property to an Atom-defined element, a Property may be mapped to a custom element in any namespace. For example, the following listing maps the Street Property of the Address Complex Type on a Supplier entry to a custom <c:Road> element.</p>
-{% highlight xml %}Snippet from Service Metadata Document 
+<p>Instead of mapping the Name property to an Atom-defined element, a Property may be mapped to a custom element in any namespace. For example, the following listing maps the Street Property of the Address Complex Type on a Supplier entry to a custom <c:Road> element.</c:Road></p>
+{% highlight xml %}Snippet from Service Metadata Document
 <EntityType Name="Supplier">
-  <Key>
-    <PropertyRef Name="ID" />
+    <Key>
+        <PropertyRef Name="ID" />
     </Key>
     <Property Name="ID" Type="Edm.Int32" Nullable="false" />
-    <Property Name="Name" Type="Edm.String" Nullable="true"/> 
+    <Property Name="Name" Type="Edm.String" Nullable="true" />
 
-    <Property Name="Address" Type="ODataDemo.Address" Nullable="false" 
+    <Property Name="Address" Type="ODataDemo.Address" Nullable="false"
               <strong>m:FC_TargetPath="Road" m:FC_SourcePath="Street" m:FC_KeepInContent="true"
-                m:FC_NsUri="http://customUri" m:FC_NsPrefix="c"/></strong> 
+                m:FC_NsUri="http://customUri" m:FC_NsPrefix="c"/></strong>
 
     <Property Name="Concurrency" Type="Edm.Int32" Nullable="false" ConcurrencyMode="Fixed" />
-    <NavigationProperty Name="Products" 
-                        Relationship="ODataDemo.Product_Supplier_Supplier_Products" 
-                        FromRole="Supplier_Products" 
+    <NavigationProperty Name="Products"
+                        Relationship="ODataDemo.Product_Supplier_Supplier_Products"
+                        FromRole="Supplier_Products"
                         ToRole="Product_Supplier" />
 </EntityType>
 
 <ComplexType Name="Address">
-  <Property Name="Street" Type="Edm.String" Nullable="true" />
-  <Property Name="City" Type="Edm.String" Nullable="true" />
-  <Property Name="State" Type="Edm.String" Nullable="true" />
-  <Property Name="ZipCode" Type="Edm.String" Nullable="true" />
-  <Property Name="Country" Type="Edm.String" Nullable="true" />
+    <Property Name="Street" Type="Edm.String" Nullable="true" />
+    <Property Name="City" Type="Edm.String" Nullable="true" />
+    <Property Name="State" Type="Edm.String" Nullable="true" />
+    <Property Name="ZipCode" Type="Edm.String" Nullable="true" />
+    <Property Name="Country" Type="Edm.String" Nullable="true" />
 </ComplexType>
 
 Supplier representation in Atom
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <entry xml:base="https://services.odata.org/(S(S_ODATA_RO))/OData/OData.svc/"
-    xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
-    xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
-    m:etag="W/"0"" xmlns="https://www.w3.org/2005/Atom" Xmlns:c="http://customUri">
-  <id>https://services.odata.org/(S(S_ODATA_RO))/OData/OData.svc/Suppliers(0)</id>
-  <title type="text">Exotic Liquids</title>
-  <updated>2010-03-11T22:47:21Z</updated>
-  <author>
-    <name />
-  </author>
-  <link rel="edit" title="Supplier" href="Suppliers(0)" />
-  <link 
-      rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Products"
-      type="application/atom+xml;type=feed" title="Products"
-      href="Suppliers(0)/Products" />
-  <category term="ODataDemo.Supplier"
-      scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
-  <strong><c:Road>NE 228th</c:Road></strong>
-  <content type="application/xml">
-    <m:properties>
-      <d:ID m:type="Edm.Int32">0</d:ID>
-      <d:Name>Exotic Liquids</d:Name>
-      <d:Concurrency m:type="Edm.Int32">0</d:Concurrency>
-      <d:Address m:type="ODataDemo.Address">
-        <d:Street>NE 228th</d:Street>
-        <d:City>Sammamish</d:City>
-        <d:State>WA</d:State>
-        <d:ZipCode>98074</d:ZipCode>
-        <d:Country>USA</d:Country>
-      </d:Address>
-    </m:properties>
-  </content>
+       xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
+       xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
+       m:etag="W/" 0""=0"" xmlns="https://www.w3.org/2005/Atom" Xmlns:c="http://customUri">
+    <id>https://services.odata.org/(S(S_ODATA_RO))/OData/OData.svc/Suppliers(0)</id>
+    <title type="text">Exotic Liquids</title>
+    <updated>2010-03-11T22:47:21Z</updated>
+    <author>
+        <name />
+    </author>
+    <link rel="edit" title="Supplier" href="Suppliers(0)" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Products"
+          type="application/atom+xml;type=feed" title="Products"
+          href="Suppliers(0)/Products" />
+    <category term="ODataDemo.Supplier"
+              scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <strong><c:Road>NE 228th</c:Road></strong>
+    <content type="application/xml">
+        <m:properties>
+            <d:ID m:type="Edm.Int32">0</d:ID>
+            <d:Name>Exotic Liquids</d:Name>
+            <d:Concurrency m:type="Edm.Int32">0</d:Concurrency>
+            <d:Address m:type="ODataDemo.Address">
+                <d:Street>NE 228th</d:Street>
+                <d:City>Sammamish</d:City>
+                <d:State>WA</d:State>
+                <d:ZipCode>98074</d:ZipCode>
+                <d:Country>USA</d:Country>
+            </d:Address>
+        </m:properties>
+    </content>
 </entry>{% endhighlight %}
 <h3>2.5. Representing Primitive Properties</h3>
-<p>When represented in a request/response payload as part of an Entry, Complex Type or a standalone construct in a request payload, primitive properties are represented in Atom as child elements of an <m:properties> element (see Representing Entities) with the name equal to the element equal to the property and value of the element set to the primitive type value formatted as described by the table in the <a href="../atom-format#PrimitiveTypes"> Primitive Types</a> section above.</p>
+<p>When represented in a request/response payload as part of an Entry, Complex Type or a standalone construct in a request payload, primitive properties are represented in Atom as child elements of an <m:properties> element (see Representing Entities) with the name equal to the element equal to the property and value of the element set to the primitive type value formatted as described by the table in the <a href="../atom-format#PrimitiveTypes"> Primitive Types</a> section above.</m:properties></p>
 <p>See <a href="../atom-format#RepresentingPropertyValues">section 3.1</a> for the format of Properties when they are represented independently from their defining Entry (i.e. outside the context of the defining Entry).</p>
 <h3>2.6. Representing Complex Type Properties</h3>
 <p>When represented as a property of an Entry or Complex Type (also within an Entry) in a request/response payload, a property whose type is a <a href="../overview#AbstractDataModel"> complex type</a> is represented as an XML element with each property of the complex type represented as a direct child element (as described in the prior section for primitive properties). For example, the Address Complex Type of a Supplier Entry is shown in the example below.</p>
@@ -540,19 +546,21 @@ <h3> 3.1. Representing Property Values</h3>
 <p>As described in the <a href="../uri-conventions#ResourcePath">Resource Path</a> section in the <a href="../uri-conventions">[OData-URI]</a> document, OData supports directly addressing a Property of an Entry. The following subsections describe how each type of Property is represented in XML.</p>
 <h4> 3.1.1. Representing Primitive Properties</h4>
 <p>When a primitive Property is represented as a standalone construct in a response from an OData service (such as when a retrieve request is made to a URI that identifies a single Property) it is represented as a single XML element where the element name equals the name of the Property and the value of the element is the value Property value. For example, the response payload to a retrieve request that identifies the Name property of a Category Entry is represented as shown below.</p>
-{% highlight xml %}<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+{% highlight xml %}
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <Name xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices">Bread</Name>{% endhighlight %}
 <h4>3.1.2. Representing Complex Types Properties</h4>
 <p>When a Property whose type is a <a href="../overview#AbstractDataModel"> complex type</a> is represented as a standalone construct, such as when a retrieve request is made to a URI that identifies a single Property, it uses a single XML element with the name of the Property and child elements for each Property defined on the complex type (formatted as per this section of the prior “Representing Primitive Properties†section). For example, the response payload to a retrieve request that identifies the Name property of a Category Entry is represented as shown below.</p>
-{% highlight xml %}<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<Address p1:type="ODataDemo.Address" 
-         xmlns:p1="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"  
+{% highlight xml %}
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<Address p1:type="ODataDemo.Address"
+         xmlns:p1="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
          xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices">
-  <Street>NE 228th</Street>
-  <City>Sammamish</City>
-  <State>WA</State>
-  <ZipCode>98074</ZipCode>
-  <Country>USA</Country>
+    <Street>NE 228th</Street>
+    <City>Sammamish</City>
+    <State>WA</State>
+    <ZipCode>98074</ZipCode>
+    <Country>USA</Country>
 </Address>{% endhighlight %}
 <h4>3.1.3. Representing the Raw value of a Property</h4>
 <p>OData services may support <a href="../uri-conventions#AddressingEntries"> addressing the entry value of a primitive Property</a> (see the description of the $value URI segment). In this case, the value is returned using the format (aka mime type) the OData service deems to be the entry format for the Property. For example, the HTTP response from the sample OData service when retrieving the Name string Property of a Category Entry is shown in the example below.</p>
@@ -562,43 +570,47 @@ <h4>3.1.3. Representing the Raw value of a Property</h4>
 
 Food{% endhighlight %}
 <h3>3.2. Representing Links</h3>
-<p>A Link (or collection of Links) represents an associated Entry (or collection of associated Entries). As described in <a href="../operations">[OData-Operations]</a> Links can be retrieved and modified to change the associations between Entries. A single link is represented as a <d:uri> element with the value of the element set to the URI that identifies the Link. A collection of links is represented as a <d:links> element with zero or more child <d:uri> elements, where each <d:uri> element represents a Link.</p>
+<p>A Link (or collection of Links) represents an associated Entry (or collection of associated Entries). As described in <a href="../operations">[OData-Operations]</a> Links can be retrieved and modified to change the associations between Entries. A single link is represented as a <d:uri> element with the value of the element set to the URI that identifies the Link. A collection of links is represented as a <d:links> element with zero or more child <d:uri> elements, where each <d:uri> element represents a Link.</d:uri></d:uri></d:links></d:uri></p>
 <p>Note: in the paragraph above, "d" represents the <a href="../terminology#ODataDataNamespace"> OData Data Namespace</a>.</p>
 <p>For example, a link with multiplicity 1 (ex. Product is related to a <em>single</em> Supplier) would be represented in XML in a response as:</p>
-{% highlight xml %}<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+{% highlight xml %}
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <uri xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices">
-  https://services.odata.org/OData/OData.svc/Suppliers(1)
+    https://services.odata.org/OData/OData.svc/Suppliers(1)
 </uri>{% endhighlight %}
 <p>For example, a link with multiplicity greater than 1 (e.g. Supplier is related to <em>many</em> products) would be represented in a response as:</p>
-{% highlight xml %}<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+{% highlight xml %}
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <links xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices">
-  <uri>https://services.odata.org/OData/OData.svc/Products(1)</uri>
-  <uri>https://services.odata.org/OData/OData.svc/Products(2)</uri>
-  <uri>https://services.odata.org/OData/OData.svc/Products(3)</uri>
-  <uri>https://services.odata.org/OData/OData.svc/Products(4)</uri>
-  <uri>https://services.odata.org/OData/OData.svc/Products(5)</uri>
-  <uri>https://services.odata.org/OData/OData.svc/Products(6)</uri>
+    <uri>https://services.odata.org/OData/OData.svc/Products(1)</uri>
+    <uri>https://services.odata.org/OData/OData.svc/Products(2)</uri>
+    <uri>https://services.odata.org/OData/OData.svc/Products(3)</uri>
+    <uri>https://services.odata.org/OData/OData.svc/Products(4)</uri>
+    <uri>https://services.odata.org/OData/OData.svc/Products(5)</uri>
+    <uri>https://services.odata.org/OData/OData.svc/Products(6)</uri>
 </links>{% endhighlight %}
 <h3>3.3. Representing Results from Service Operations</h3>
 <p>As described in <a href="../operations">[OData-Operations]</a> OData services may expose custom behaviors via Service Operations, which may accept input parameters identified by the request URI (as described in <a href="../uri-conventions">[OData-URI]</a>). This section specifies how the results of a Service Operation are formatted using Atom or XML. Service operations support returning:</p>
 <ul>
-<li>A single primitive value or collection of primitive values</li>
-<li>A single complex type or collection of complex types</li>
-<li>A single Entry or collection of Entries</li>
+    <li>A single primitive value or collection of primitive values</li>
+    <li>A single complex type or collection of complex types</li>
+    <li>A single Entry or collection of Entries</li>
 </ul>
 <p>If a Service Operation returns a collection of Entries or a single Entry, then the Entries (or Entry) are formatted in Atom as described in the <a href="../atom-format#RepresentingCollectionsofEntries"> Representing Collections of Entries</a> or <a href="../atom-format#RepresentingEntries">Representing an Entry</a> section.</p>
 <p>If a Service Operation returns a single primitive value, then it is formatted in XML as per the <a href="../atom-format#xml_RepresentingPrimitiveProperties">Representing Primitive Properties</a> section. Likewise, if a Service Operation returns a single Complex Type value, then it is represented in XML as per the <a href="../atom-format#xml_RepresentingComplexTypesProperties"> Representing Complex Type Properties</a> section.</p>
-<p>If a Service Operation returns a collection of primitive values, then the primitives are returned as the value of <m:element> elements which are children of the root element. The name of the root element should be equal to the name of the Service Operation that was invoked. For example a response payload from a "GetInts" Service Operation that returns a collection of integer values would be formatted as shown in the following listing.</p>
+<p>If a Service Operation returns a collection of primitive values, then the primitives are returned as the value of <m:element> elements which are children of the root element. The name of the root element should be equal to the name of the Service Operation that was invoked. For example a response payload from a "GetInts" Service Operation that returns a collection of integer values would be formatted as shown in the following listing.</m:element></p>
 {% highlight xml %}<GetInts xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <element>0</element>
-  <element>1</element>
-  <element>2</element>
+    <element>0</element>
+    <element>1</element>
+    <element>2</element>
 </GetInts>{% endhighlight %}
-<p>If a Service Operation returns a collection of complex types, then the collection is represented in XML by a root element whose name is equal to the name of the Service Operation and includes one child <m:element> element for each Complex Type value in the collection returned from the Service Operation. The Properties of each Complex Type are represented as per the <a href="../atom-format#xml_RepresentingComplexTypesProperties"> Representing Complex Type Properties</a> section. Finally, each <m:element> element should include an m:type attribute that lists the namespace qualified name of the Complex Type. For example, response payload from a "GetAddresses" Service Operation that returns a collection of Address Complex Type values would be represented as show in the following listing.</p>
+<p>If a Service Operation returns a collection of complex types, then the collection is represented in XML by a root element whose name is equal to the name of the Service Operation and includes one child <m:element> element for each Complex Type value in the collection returned from the Service Operation. The Properties of each Complex Type are represented as per the <a href="../atom-format#xml_RepresentingComplexTypesProperties"> Representing Complex Type Properties</a> section. Finally, each <m:element> element should include an m:type attribute that lists the namespace qualified name of the Complex Type. For example, response payload from a "GetAddresses" Service Operation that returns a collection of Address Complex Type values would be represented as show in the following listing.</m:element></m:element></p>
 {% highlight xml %}<GetAddressses xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <element type="SampleNamespace.Address">
-    <street>123 Contoso Ave</street>
-    <city>London</street>
-  </element>
-  <!-- additional Addresses returned go here -->
-</GetAddresses>{% endhighlight %}
+    <element type="SampleNamespace.Address">
+        <street>123 Contoso Ave</street>
+        <city>London</street>
+        </city>
+    </element>
+    <!-- additional Addresses returned go here -->
+    </GetAddresses>{% endhighlight %}
+</GetAddressses>
\ No newline at end of file
diff --git a/pages/documentation/atom-format-v3.html b/pages/documentation/atom-format-v3.html
index 7363b6ef..1f5b7637 100644
--- a/pages/documentation/atom-format-v3.html
+++ b/pages/documentation/atom-format-v3.html
@@ -1,12 +1,9 @@
 ---
-layout: page
+layout: documentation-archived
 title: Atom Format (OData Version 3.0)
 date: 2014-02-20 08:13:13.000000000 +08:00
 permalink: /documentation/odata-version-3-0/atom-format/
 ---
-<p class="alert alert-success">OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in OData Version 3.0. 
-<br><br>
-<a href="/documentation/" class="alert-link" title=""><span class="glyphicon glyphicon-arrow-right"></span> Go to OData Version 4.0</a></p>
 <h2 id="overview">1. Overview</h2>
 <p>The OData protocol is comprised of a set of specifications for representing and interacting with structured content. This document describes the OData Atom Format returned from an OData Service when requesting the <code>application/atom+xml</code> mime type.</p>
 <p>An OData payload may represent:</p>
diff --git a/pages/documentation/batch-processing-v2.html b/pages/documentation/batch-processing-v2.html
index e01d1a3e..a97cbed6 100644
--- a/pages/documentation/batch-processing-v2.html
+++ b/pages/documentation/batch-processing-v2.html
@@ -1,12 +1,9 @@
 ---
-layout: page
+layout: documentation-archived
 title: Batch Processing (OData Version 2.0)
 date: 2014-02-28 03:34:09.000000000 +08:00
 permalink: /documentation/odata-version-2-0/batch-processing/
 ---
-<p class="alert alert-success">OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in OData Version 2.0. 
-<br><br>
-<a href="/documentation/" class="alert-link" title=""><span class="glyphicon glyphicon-arrow-right"></span> Go to OData Version 4.0</a></p>
 <h2>Introduction</h2>
 <p>The OData protocol exposes a uniform service interface to operate on collections of structured and unstructured data. <a href="../operations">[OData-Operations]</a> enumerates the set of operations supported by the uniform interface and describes a means to send one operation per HTTP request.</p>
 <p>This document builds on the <a href="../operations">[OData-Operations]</a> document and describes how an OData implementation can optionally support executing multiple operations sent in a single HTTP request through the use of Batching. This document covers both how Batch operations are represented and processed.</p>
diff --git a/pages/documentation/batch-processing-v3.html b/pages/documentation/batch-processing-v3.html
index 06e25f7c..5a45dd07 100644
--- a/pages/documentation/batch-processing-v3.html
+++ b/pages/documentation/batch-processing-v3.html
@@ -1,12 +1,9 @@
 ---
-layout: page
+layout: documentation-archived
 title: Batch Processing (OData Version 3.0)
 date: 2014-02-20 08:11:24.000000000 +08:00
 permalink: /documentation/odata-version-3-0/batch-processing/
 ---
-<p class="alert alert-success">OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in OData Version 3.0. 
-<br><br>
-<a href="/documentation/" class="alert-link" title=""><span class="glyphicon glyphicon-arrow-right"></span> Go to OData Version 4.0</a></p>
 <h1 id="opendataprotocolodatabatchprocessing"></h1>
 <h1 id="introduction">1. Introduction</h1>
 <p>The OData protocol defines a way to query and manipulate data (described using an EDM model) using a simple set of operations. This document builds on the ‘Interaction Semantics’ section of the core OData specification document and describes how an OData implementation MAY support executing multiple operations sent in a single HTTP request through the use of Batching. This document covers both how Batch operations are represented and processed.</p>
diff --git a/pages/documentation/common-schema-definition-language-csdl.html b/pages/documentation/common-schema-definition-language-csdl.html
index d35b0fd9..7036030d 100644
--- a/pages/documentation/common-schema-definition-language-csdl.html
+++ b/pages/documentation/common-schema-definition-language-csdl.html
@@ -1,12 +1,9 @@
 ---
-layout: page
+layout: documentation-archived
 title: Common Schema Definition Language (CSDL) (OData Version 3.0)
 date: 2014-02-20 08:01:53.000000000 +08:00
 permalink: /documentation/odata-version-3-0/common-schema-definition-language-csdl/
 ---
-<p class="alert alert-success">OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in OData Version 3.0. 
-<br><br>
-<a href="/documentation/" class="alert-link" title=""><span class="glyphicon glyphicon-arrow-right"></span> Go to OData Version 4.0</a></h5>
 <h2 id="introduction">Introduction</h2>
 <p>OData services are described by an Entity Data Model (EDM). Common Schema Definition Language (CSDL) defines an XML-based representation of the entity model exposed by an OData service. CSDL is based on standards defined in [<code><a href="https://www.w3.org/TR/2006/REC-xml11-20060816/">XML 1.1</a></code>] and [<code><a href="https://www.w3.org/standards/techs/xmlschema#w3c_all">XML Schema</a></code>].</p>
 <p>An OData service SHOULD provide a CSDL description of its entity model when a client requests a description of the entity model by sending a <code>GET</code> request to <code><serviceRoot>/$metadata</code>. <code>$metadata</code> MUST wrap the CSDL document in an EDMX wrapper.</p>
diff --git a/pages/documentation/documentation.html b/pages/documentation/documentation.html
index 191fffad..586eebf3 100644
--- a/pages/documentation/documentation.html
+++ b/pages/documentation/documentation.html
@@ -1,12 +1,13 @@
 ---
 layout: page
-title: Documentation
+title: OData Version 4.0
 date: 2014-02-20 06:56:35.000000000 +08:00
 permalink: /documentation/
 ---
-<h2>OData Version 4.01</h2>
 <p>OData has been <a href="https://www.oasis-open.org/news/pr/oasis-approves-odata-4-0-standards-for-an-open-programmable-web">standardized by OASIS</a> and <a href="https://jtc1info.org/isoiec-jtc-1-approves-oasis-odata-standard-for-open-data-exchange/">approved as an ISO/IEC International Standard</a>.</p> 
-<p>The OASIS OData Technical Committee has published the latest OData 4.01 draft as a <a href="/blog/OData-401-Committee-Spec-Published">Committee Specification.</a> The following references the latest published Committee Specification documents.</p>
+
+<h2>Documentation</h2>
+<p>The OASIS OData Technical Committee has published the latest <strong>OData 4.01</strong> draft as a <a href="/blog/OData-401-Committee-Spec-Published">Committee Specification.</a> The following references the latest published Committee Specification documents.</p>
 <ul>
 <li><a href="https://docs.oasis-open.org/odata/new-in-odata/v4.01/new-in-odata-v4.01.html">What’s New in OData Version 4.01</a> | <a href="https://docs.oasis-open.org/odata/new-in-odata/v4.01/new-in-odata-v4.01.pdf" aria-label="'What's new in ODATA version 4.01 PDF'">PDF</a></li>
 <li><a href="https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html">Part 1: Protocol</a> | <a href="https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.pdf" aria-label="'Part 1: Protocol' PDF">PDF</a></li>
@@ -18,12 +19,15 @@ <h2>OData Version 4.01</h2>
 <li><a href="https://github.com/oasis-tcs/odata-vocabularies/tree/master/vocabularies/">Standardized Vocabularies</a></li>
 <li><a href="https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/odata-data-aggregation-ext-v4.0.html">Aggregation Extension (Committee Specification) </a> | <a href="https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/odata-data-aggregation-ext-v4.0.pdf" aria-label="'Aggregation Extension (Committee Specification)' PDF">PDF</a></li>
 </ul>
-<p><strong>To get started learning OData V4</strong>, we recommend working through the <a href="/getting-started/basic-tutorial">Beginner Tutorial</a> 
-    and <a href="/getting-started/advanced-tutorial">Advanced Tutorial</a> first. 
-    Next, read <em><a href="https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html">Part 1: Protocol</a></em> for an overview of the OData Protocol. 
-    See <em><a href="https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html">Part 2: URL Conventions</a></em> for details on the URL syntax, and 
-    <em><a href="https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html">OData Common Schema Definition Language (CSDL) XML Representation</a></em> for details on the OData Modeling language. 
+
+<h2>Begin Learning OData V4</h2>
+We recommend working through the <a href="/getting-started/basic-tutorial">Beginner Tutorial</a>
+    and <a href="/getting-started/advanced-tutorial">Advanced Tutorial</a> first.
+    Next, read <em><a href="https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html">Part 1: Protocol</a></em> for an overview of the OData Protocol.
+    See <em><a href="https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html">Part 2: URL Conventions</a></em> for details on the URL syntax, and
+    <em><a href="https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html">OData Common Schema Definition Language (CSDL) XML Representation</a></em> for details on the OData Modeling language.
     Finally, refer to <em><a href="https://docs.oasis-open.org/odata/odata-json-format/v4.01/odata-json-format-v4.01.html">OData JSON Format</a></em> for details on the OData JSON payload format.</p>
+
 <h2>Older Versions</h2>
 <ul>
 <li><a href="/documentation/odata-version-3-0">OData Version 3.0</a></li>
diff --git a/pages/documentation/json-format-v2.html b/pages/documentation/json-format-v2.html
index e49f0db7..e1b24148 100644
--- a/pages/documentation/json-format-v2.html
+++ b/pages/documentation/json-format-v2.html
@@ -1,12 +1,9 @@
 ---
-layout: page
+layout: documentation-archived
 title: JSON Format (OData Version 2.0)
 date: 2014-02-28 03:36:01.000000000 +08:00
 permalink: /documentation/odata-version-2-0/json-format/
 ---
-<p class="alert alert-success">OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in OData Version 2.0. 
-<br><br>
-<a href="/documentation/" class="alert-link" title=""><span class="glyphicon glyphicon-arrow-right"></span> Go to OData Version 4.0</a></p>
 <h2>Introduction</h2>
 <p>OData supports two formats for representing the resources (Collections, Entries, Links, etc) it exposes: the XML-based AtomPub format and the JSON format. This document describes how OData resources are represented in JSON and <a href="../atom-format">[OData-Atom]</a> describes the AtomPub representation. The <a href="../operations#ContentTypeNegotation">content type negotiation</a> section of the <a href="../operations">[OData-Operations]</a> document describes how clients can use standard HTTP content type negotiation to tell an OData service which format it wants to use.</p>
 <h2>1. Background</h2>
diff --git a/pages/documentation/json-verbose-format-v3.html b/pages/documentation/json-verbose-format-v3.html
index 5d65f66b..5abbdf6b 100644
--- a/pages/documentation/json-verbose-format-v3.html
+++ b/pages/documentation/json-verbose-format-v3.html
@@ -1,12 +1,9 @@
 ---
-layout: page
+layout: documentation-archived
 title: JSON Verbose Format (OData Version 3.0)
 date: 2014-02-20 08:15:04.000000000 +08:00
 permalink: /documentation/odata-version-3-0/json-verbose-format/
 ---
-<p class="alert alert-success">OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in OData Version 3.0. 
-<br><br>
-<a href="/documentation/" class="alert-link" title=""><span class="glyphicon glyphicon-arrow-right"></span> Go to OData Version 4.0</a></p>
 <p>OData is released under the <a href="https://www.microsoft.com/openspecifications/en/us/programs/osp/default.aspx">Open Specification Promise</a> to allow anyone to freely interoperate with OData implementations.<br />
 Current Revision: 4/27/2012</p>
 <h2 id="overview">Overview</h2>
diff --git a/pages/documentation/odata-version-2-0.html b/pages/documentation/odata-version-2-0.html
index 5bc4f188..4f0e0cd6 100644
--- a/pages/documentation/odata-version-2-0.html
+++ b/pages/documentation/odata-version-2-0.html
@@ -1,21 +1,19 @@
 ---
-layout: page
+layout: documentation-archived
 title: OData Version 2.0
 date: 2014-02-28 03:18:29.000000000 +08:00
 permalink: /documentation/odata-version-2-0/
 ---
-<p class="alert alert-success">OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in OData Version 2.0. 
-<br><br>
-<a href="/documentation/" class="alert-link" title=""><span class="glyphicon glyphicon-arrow-right"></span> Go to OData Version 4.0</a></p>
-
+<h2>Documentation</h2>
 <ul>
-<li><a href="/documentation/odata-version-2-0/overview">OData Version 2.0 Overview</a></li>
-<li><a href="/documentation/odata-version-2-0/terminology">OData Version 2.0 Terminology</a></li>
-<li><a href="/documentation/odata-version-2-0/uri-conventions">OData Version 2.0 Uri Conventions</a></li>
-<li><a href="/documentation/odata-version-2-0/operations">OData Version 2.0 Operations</a></li>
-<li><a href="/documentation/odata-version-2-0/batch-processing">OData Version 2.0 Batch Processing</a></li>
-<li><a href="/documentation/odata-version-2-0/atom-format">OData Version 2.0 Atom Format</a></li>
-<li><a href="/documentation/odata-version-2-0/json-format">OData Version 2.0 JSON Verbose Format</a></li>
+    <li><a href="/documentation/odata-version-2-0/overview">Overview</a></li>
+    <li><a href="/documentation/odata-version-2-0/terminology">Terminology</a></li>
+    <li><a href="/documentation/odata-version-2-0/uri-conventions">Uri Conventions</a></li>
+    <li><a href="/documentation/odata-version-2-0/operations">Operations</a></li>
+    <li><a href="/documentation/odata-version-2-0/batch-processing">Batch Processing</a></li>
+    <li><a href="/documentation/odata-version-2-0/atom-format">Atom Format</a></li>
+    <li><a href="/documentation/odata-version-2-0/json-format">JSON Verbose Format</a></li>
 </ul>
-<p>The description of OData on this page is divided into a group of documents (Core, Formats, URL Conventions, etc) to reflect the fact OData is designed to be modular such that an OData implementation need only implement as much of an OData specification as required for its target scenario.</p>
-<p><strong>To get started learning OData V2</strong>, begin by reading <a href="/documentation/odata-version-2-0/overview">the OData V2 overview</a> and progress to the other documents are required by your scenario.</p>
+
+<h2>Begin Learning OData V2</h2>
+<p>We recommend beginning by reading <a href="/documentation/odata-version-2-0/overview">the OData V2 overview</a>, then progressing to the other documents as required by your scenario.</p>
diff --git a/pages/documentation/odata-version-3-0-core-protocol.html b/pages/documentation/odata-version-3-0-core-protocol.html
index 78f00a2e..0c459fe6 100644
--- a/pages/documentation/odata-version-3-0-core-protocol.html
+++ b/pages/documentation/odata-version-3-0-core-protocol.html
@@ -1,14 +1,9 @@
 ---
-layout: page
+layout: documentation-archived
 title: OData Version 3.0 Core Protocol
 date: 2014-02-20 07:50:09.000000000 +08:00
 permalink: /documentation/odata-version-3-0/odata-version-3-0-core-protocol/
 ---
-<p class="alert alert-success">
-    OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in OData Version 3.0.
-    <br><br>
-    <a href="/documentation/" class="alert-link" title=""><span class="glyphicon glyphicon-arrow-right"></span> Go to OData Version 4.0</a>
-</p>
 <h2 id="overview">1. Overview</h2>
 <p>The OData Protocol is an application-level protocol for interacting with data via RESTful web services. The protocol supports the description of data models and the editing and querying of data according to those models. It provides facilities for:</p>
 <ul>
diff --git a/pages/documentation/odata-version-3-0.html b/pages/documentation/odata-version-3-0.html
index 1500bcd3..911ef4d2 100644
--- a/pages/documentation/odata-version-3-0.html
+++ b/pages/documentation/odata-version-3-0.html
@@ -1,20 +1,24 @@
 ---
-layout: page
+layout: documentation-archived
 title: OData Version 3.0
 date: 2014-02-20 07:35:10.000000000 +08:00
 permalink: /documentation/odata-version-3-0/
 ---
+<h2>Documentation</h2>
+<ul>
+<li><a href="/documentation/odata-version-3-0/odata-version-3-0-core-protocol">Core Protocol</a> | <a href="http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/[MS-ODATA].pdf" aria-label="'OData Version 3.0 Core Protocol' PDF">PDF</a></li>
+<li><a href="/documentation/odata-version-3-0/common-schema-definition-language-csdl">Common Schema Definition Language (CSDL)</a> | <a href="http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/[MC-CSDL].pdf" aria-label="'OData Version 3.0 Common Schema Definition Language (CSDL)' PDF">PDF</a></li>
+<li><a href="/documentation/odata-version-3-0/url-conventions">Url Conventions</a></li>
+<li><a href="/documentation/odata-version-3-0/abnf">ABNF</a></li>
+<li><a href="/documentation/odata-version-3-0/batch-processing">Batch Processing</a></li>
+<li><a href="/documentation/odata-version-3-0/atom-format">Atom Format</a></li>
+<li><a href="/documentation/odata-version-3-0/json-verbose-format">JSON Verbose Format</a></li>
+</ul>
+
+<h2>Begin Learning OData V3</h2>
+<p>We recommend beginning by reading <a href="/documentation/odata-version-3-0/odata-version-3-0-core-protocol">OData Version 3.0 Core Protocol</a>, then progressing to the other documents as required by your scenario.</p>
 
-<p class="alert alert-success">OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in OData Version 3.0. 
-<br><br>
-<a href="/documentation/" class="alert-link" title=""><span class="glyphicon glyphicon-arrow-right"></span> Go to OData Version 4.0</a></p>
+<h2>Older Versions</h2>
 <ul>
-<li><a href="/documentation/odata-version-3-0/odata-version-3-0-core-protocol">OData Version 3.0 Core Protocol</a> | <a href="http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/[MS-ODATA].pdf" aria-label="'OData Version 3.0 Core Protocol' PDF">PDF</a></li>
-<li><a href="/documentation/odata-version-3-0/common-schema-definition-language-csdl">OData Version 3.0 Common Schema Definition Language (CSDL)</a> | <a href="http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/[MC-CSDL].pdf" aria-label="'OData Version 3.0 Common Schema Definition Language (CSDL)' PDF">PDF</a></li>
-<li><a href="/documentation/odata-version-3-0/url-conventions">OData Version 3.0 Url Conventions</a></li>
-<li><a href="/documentation/odata-version-3-0/abnf">OData Version 3.0 ABNF</a></li>
-<li><a href="/documentation/odata-version-3-0/batch-processing">OData Version 3.0 Batch Processing</a></li>
-<li><a href="/documentation/odata-version-3-0/atom-format">OData Version 3.0 Atom Format</a></li>
-<li><a href="/documentation/odata-version-3-0/json-verbose-format">OData Version 3.0 JSON Verbose Format</a></li>
+<li><a href="/documentation/odata-version-2-0">OData Version 2.0</a></li>
 </ul>
-<p><strong>To get started learning OData V3</strong>, begin by reading <a href="/documentation/odata-version-3-0/odata-version-3-0-core-protocol">OData Version 3.0 Core Protocol</a> and progress to the other documents as required by your scenario.</p>
diff --git a/pages/documentation/operations.html b/pages/documentation/operations.html
index 37fbc0c2..5ded01d7 100644
--- a/pages/documentation/operations.html
+++ b/pages/documentation/operations.html
@@ -1,12 +1,9 @@
 ---
-layout: page
+layout: documentation-archived
 title: Operations (OData Version 2.0)
 date: 2014-02-28 03:32:08.000000000 +08:00
 permalink: /documentation/odata-version-2-0/operations/
 ---
-<p class="alert alert-success">OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in OData Version 2.0. 
-<br><br>
-<a href="/documentation/" class="alert-link" title=""><span class="glyphicon glyphicon-arrow-right"></span> Go to OData Version 4.0</a></p>
 <h2>Introduction</h2>
 <p>The OData protocol exposes a uniform service interface to operate on collections of structured and unstructured data. Most of the semantics of operations in OData come from the AtomPub protocol [RFC5023], which in turn builds on top of HTTP <a href="https://www.ietf.org/rfc/rfc2616.txt">[RFC2616]</a>.</p>
 <p>This document describes the operation model for the protocol, specifying the interactions between clients and servers for retrieving and manipulating data in an OData service. It builds on the <a href="../overview">[OData-Core]</a> document for core concepts, <a href="../uri-conventions">[OData-URI]</a> for URI conventions and on the formats specifications for Atom <a href="/developers/protocols/atom-format"> [OData-Atom]</a> and JSON <a href="../json-format">[OData-JSON]</a> for the description of data representations.</p>
@@ -445,19 +442,21 @@ <h2>3. Additional Interaction Model Considerations</h2>
 <h3> 3.1 Concurrency control and ETags</h3>
 <p>OData uses HTTP ETags for optimistic concurrency control. A few special considerations apply for ETags:</p>
 <ul>
-<li>When retrieving an Entry the server returns an opaque ETag value
-<ul>
-<li>When getting several Entries in a feed, the ETag value is included as metadata in the Entry itself. See <a href="../atom-format">[OData-Atom]</a> and <a href="../json-format">[OData-JSON]</a> for actual format details.</li>
-<li>When retrieving a single Entry, the ETag is returned as a response header called ETag as defined by HTTP. The Server can choose to also include it in the body as they would do for feeds for consistency.</li>
-<li>During processing of POST, PUT and MERGE the server should compute a new ETag and return it in a response header, regardless of whether the response has a body with the actual Entry information.</li>
-</ul>
-</li>
-<li>When issuing a PUT, MERGE or DELETE request, clients need to indicate an ETag in the <em>If-Match</em> HTTP request header.
-<ul>
-<li>If for a given client it is acceptable to overwrite any version of the Entry in the server, then the value "*" may be used instead.</li>
-<li>If a given Entry has an ETag and a client attempts to modify or delete the Entry without an If-Match header servers should fail the request with a 412 response code.</li>
-</ul>
-</li>
+    <li>
+        When retrieving an Entry the server returns an opaque ETag value
+        <ul>
+            <li>When getting several Entries in a feed, the ETag value is included as metadata in the Entry itself. See <a href="../atom-format">[OData-Atom]</a> and <a href="../json-format">[OData-JSON]</a> for actual format details.</li>
+            <li>When retrieving a single Entry, the ETag is returned as a response header called ETag as defined by HTTP. The Server can choose to also include it in the body as they would do for feeds for consistency.</li>
+            <li>During processing of POST, PUT and MERGE the server should compute a new ETag and return it in a response header, regardless of whether the response has a body with the actual Entry information.</li>
+        </ul>
+    </li>
+    <li>
+        When issuing a PUT, MERGE or DELETE request, clients need to indicate an ETag in the <em>If-Match</em> HTTP request header.
+        <ul>
+            <li>If for a given client it is acceptable to overwrite any version of the Entry in the server, then the value "*" may be used instead.</li>
+            <li>If a given Entry has an ETag and a client attempts to modify or delete the Entry without an If-Match header servers should fail the request with a 412 response code.</li>
+        </ul>
+    </li>
 </ul>
 <p>OData servers will use weak ETags often as a way of indicating that two resources may be semantically equivalent but a particular request may see a different representation of it. Clients should be prepared to handle weak and strong ETags.</p>
 <h3> 3.2 Method Tunneling through POST</h3>
diff --git a/pages/documentation/overview.html b/pages/documentation/overview.html
index 05f3bf88..64ba3640 100644
--- a/pages/documentation/overview.html
+++ b/pages/documentation/overview.html
@@ -1,12 +1,9 @@
 ---
-layout: page
+layout: documentation-archived
 title: Overview (OData Version 2.0)
 date: 2014-02-28 03:27:38.000000000 +08:00
 permalink: /documentation/odata-version-2-0/overview/
 ---
-<p class="alert alert-success">OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in OData Version 2.0.
-<br><br>
-<a href="/documentation/" class="alert-link" title=""><span class="glyphicon glyphicon-arrow-right"></span> Go to OData Version 4.0</a></p>
 <p>The Open Data Protocol (OData) enables the creation of HTTP-based data services, which allow resources identified using Uniform Resource Identifiers (URIs) and defined in an abstract data model, to be published and edited by Web clients using simple HTTP messages. OData is intended to be used to expose and access information from a variety of sources including, but not limited to, relational databases, file systems, content management systems, and traditional Web sites.</p>
 <p>OData is made up of a group of specifications. This specification describes OData's core concepts and the following specifications define optional extensions to the foundations defined in this document:</p>
 <div>
diff --git a/pages/documentation/terminology.html b/pages/documentation/terminology.html
index a832fcfb..ea445169 100644
--- a/pages/documentation/terminology.html
+++ b/pages/documentation/terminology.html
@@ -1,12 +1,9 @@
 ---
-layout: page
+layout: documentation-archived
 title: Terminology (OData Version 2.0)
 date: 2014-02-28 03:28:21.000000000 +08:00
 permalink: /documentation/odata-version-2-0/terminology/
 ---
-<p class="alert alert-success">OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in OData Version 2.0. 
-<br><br>
-<a href="/documentation/" class="alert-link" title=""><span class="glyphicon glyphicon-arrow-right"></span> Go to OData Version 4.0</a></p>
 <h2 role="heading">Summary of References:</h2>
 <div>
 <table border="1" cellspacing="0" cellpadding="0" aria-label="Summary of References">
diff --git a/pages/documentation/uri-conventions.html b/pages/documentation/uri-conventions.html
index 836e37e8..6438468e 100644
--- a/pages/documentation/uri-conventions.html
+++ b/pages/documentation/uri-conventions.html
@@ -1,12 +1,9 @@
 ---
-layout: page
+layout: documentation-archived
 title: URI Conventions (OData Version 2.0)
 date: 2014-02-28 03:30:31.000000000 +08:00
 permalink: /documentation/odata-version-2-0/uri-conventions/
 ---
-<p class="alert alert-success">OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in OData Version 2.0. 
-<br><br>
-<a href="/documentation/" class="alert-link" title=""><span class="glyphicon glyphicon-arrow-right"></span> Go to OData Version 4.0</a></p>
 <h2>Introduction</h2>
 <p>The Open Data Protocol (OData) enables the creation of REST-based data services, which allow resources, identified using Uniform Resource Identifiers (URIs) and defined in a <a href="../overview#ODataBasics">data model</a>, to be published and edited by Web clients using simple HTTP messages. This specification defines a set of recommended (but not required) rules for constructing URIs to identify the data and metadata exposed by an OData server as well as a set of reserved URI query string operators, which if accepted by an OData server, MUST be implemented as required by this document.</p>
 <p>The <a href="../atom-format">[OData:Atom]</a> and <a href="../json-format">[OData:JSON]</a> documents specify the format of the resource representations that are exchanged using OData and the <a href="../operations">[OData:Operations]</a> document describes the actions that can be performed on the URIs (optionally constructed following the conventions defined in this document) embedded in those representations.</p>
diff --git a/pages/documentation/url-conventions.html b/pages/documentation/url-conventions.html
index 9c21764d..847b59b6 100644
--- a/pages/documentation/url-conventions.html
+++ b/pages/documentation/url-conventions.html
@@ -1,12 +1,9 @@
 ---
-layout: page
+layout: documentation-archived
 title: URL Conventions (OData Version 3.0)
 date: 2014-02-20 09:14:47.000000000 +08:00
 permalink: /documentation/odata-version-3-0/url-conventions/
 ---
-<p class="alert alert-success">OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in OData Version 3.0. 
-<br><br>
-<a href="/documentation/" class="alert-link" title=""><span class="glyphicon glyphicon-arrow-right"></span> Go to OData Version 4.0</a></p>
 <h2 id="url1">1. Introduction</h2>
 <p>The Open Data Protocol (OData) enables the creation of REST-based data services, which allow resources, identified using Uniform Resource Identifiers (URLs) and defined in a data model, to be published and edited by Web clients using simple HTTP messages. This specification defines a set of recommended (but not required) rules for constructing URLs to identify the data and metadata exposed by an OData service as well as a set of reserved URL query string operators, which if accepted by an OData service, MUST be implemented as required by this document.</p>
 <p>The [OData:Atom] and [OData:JSON] documents specify the format of the resource representations that are exchanged using OData and the [OData:Operations] document describes the actions that can be performed on the URLs (optionally constructed following the conventions defined in this document) embedded in those representations.</p>
diff --git a/pages/ecosystem.html b/pages/ecosystem.html
index 4c266912..e4ea7ca9 100644
--- a/pages/ecosystem.html
+++ b/pages/ecosystem.html
@@ -5,8 +5,24 @@
 permalink: /ecosystem/
 ---
 <div class="row">
-<div class="col-md-2">
-<ul class="nav nav-pills nav-stacked">
+<div class="col-md-10" style="padding-bottom:9px; margin:0 0 20px;">
+	<p>Below we have collected a list of key uses of OData, which will continue to grow along with the OData ecosystem. If you create or know of an OData use case not listed, be sure to let us know!</p>
+	<div style="display:flex; justify-content: center; border-bottom:1px solid #eeeeee">
+		<a class="big-action"
+			href="https://github.com/ODataOrg/odataorg.github.io"
+			style="margin-top:2rem; margin-bottom: 2rem;">
+			Contribute
+		</a>
+		<!-- TODO: link to contributions form page after completion. -->
+		<!--<a class="big-action" 
+				href="/contribute/"
+				style="margin-top:2rem; margin-bottom: 2rem;">
+			Contribute
+		</a>-->
+	</div>
+</div>
+<div class="col-md-10">
+<ul class="nav nav-pills">
 	<li class="active"><a href="#producers" data-toggle="pill">Producers</a></li>
 	<li><a href="#consumers" data-toggle="pill">Consumers</a></li>
 	<li><a href="#liveservices" data-toggle="pill">Live Services</a></li>
@@ -18,15 +34,13 @@
 <div class="tab-content">
 	<div id="producers" class="tab-pane active">
 	<h2 id="producers_header">Producers</h2>
-	OData producers are services that expose their data using the OData protocol. Below we have collected a list of key OData producers, which will continue to grow along with the OData ecosystem. You can use <a href="/libraries">OData SDK</a> to build your own OData producers. If you create or know of an OData producer not listed be sure to let us know via our new <a href="/contribution">contribution page</a>.
-
-	<a href="https://www.telerik.com/products/orm.aspx">Telerik OpenAccess ORM</a>In mid-2010 Telerik released a LINQ implementation that is simple to use and produces domain models very fast. Built on top of the enterprise-grade Telerik OpenAccess ORM the LINQ implementation allows you to easily build an OData feed via a few easy steps by using the OpenAccess Visual Designer and the Data Services Wizard. For more info, visit <a href="https://www.telerik.com/odata">www.telerik.com/odata</a>
+	<p>OData producers are services that expose their data using the OData protocol. You can use the <a href="/libraries">OData SDK</a> to build your own OData producers.</p></p>
 	<table class="table table-striped table-hover" aria-describedby="producers_header">
 	<caption class="sr-only">Producers</caption>
 	<tbody>
 		{% assign producers = site.ecosys | where: "category", "producers" %}
 		{% for producer in producers %}
-			<tr>
+		<tr>
 			<td width="200">
 				{% if producer.link == NULL %}
 					{{producer.title}}
@@ -35,14 +49,30 @@ <h2 id="producers_header">Producers</h2>
 				{% endif %}
 				</td>
 			<td>{{producer.content}}</td>
-			</tr>
+		</tr>
 		{% endfor %}
+		<!-- TODO: After determining the data storage and retrieval mechanism for contributions via form,
+		 use the below code as a sample for pulling data from a CSV file, or remove. -->
+		<!--{% for submission in site.data.ecosys-submissions %}
+			{% if submission.product_category == "Producer" %}
+				<tr>
+				<td width="200">
+					{% if submission.product_link == NULL %}
+						{{submission.product_name}}
+					{% else %}
+					<a href={{submission.product_link}}>{{submission.product_name}}</a>
+					{% endif %}
+					</td>
+				<td>{{submission.brief_description}}</td>
+				</tr>
+			{% endif %}
+		{% endfor %}-->
 	</tbody>
 	</table>
 	</div>
 	<div id="consumers" class="tab-pane">
 	<h2 id="consumers_header">Consumers</h2>
-	OData consumers are simply applications that consume data exposed using the OData protocol. OData consumers can vary greatly in sophistication, from something as simple as your web browser all the way through to a custom application that takes advantage of all the features of the OData Protocol. Below we have collected a list of key OData consumers, which will continue to grow along with the OData ecosystem. Simply pick a consumer from the list below and point it at one of the live services. If you create or know of an OData consumer not listed be sure to let us know via our new <a href="/contribution">contribution page</a>.
+	<p>OData consumers are simply applications that consume data exposed using the OData protocol. OData consumers can vary greatly in sophistication, from something as simple as your web browser all the way through to a custom application that takes advantage of all the features of the OData Protocol. Simply pick a consumer from the list below and point it at one of the live services.</p>
 	<table class="table table-striped table-condensed table-hover" aria-describedby="consumers_header">
 	<caption class="sr-only">Consumers</caption>
 	<tbody>
@@ -57,19 +87,36 @@ <h2 id="consumers_header">Consumers</h2>
 					{% endif %}
 				</td>
 				<td>{{consumer.content}}</td>
-				</tr>
+			</tr>
 		{% endfor %}
+		<!-- TODO: After determining the data storage and retrieval mechanism for contributions via form,
+		 use the below code as a sample for pulling data from a CSV file, or remove. -->
+		<!--{% for submission in site.data.ecosys-submissions %}
+			{% if submission.product_category == "Consumer" %}
+				<tr>
+				<td width="200">
+					{% if submission.product_link == NULL %}
+						{{submission.product_name}}
+					{% else %}
+					<a href={{submission.product_link}}>{{submission.product_name}}</a>
+					{% endif %}
+					</td>
+				<td>{{submission.brief_description}}</td>
+				</tr>
+			{% endif %}
+		{% endfor %}-->
 </tbody>
 </table>
 </div>
 <div id="liveservices" class="tab-pane">
-	<h2 id="liveservices_header">Live Services</h2>
+<h2 id="liveservices_header">Live Services</h2>
+<p>OData live services expose data to be consumed.</p>
 <table class="table table-striped table-condensed table-hover" aria-describedby="liveservices_header">
 <caption class="sr-only">Live Services</caption>
 <tbody>
 	{% assign liveservices = site.ecosys | where: "category", "liveservices" %}
 	{% for liveservice in liveservices %}
-		<tr>
+	<tr>
 		<td width="200">
 			{% if liveservice.link == NULL %}
 				{{liveservice.title}}
@@ -78,14 +125,30 @@ <h2 id="liveservices_header">Live Services</h2>
 			{% endif %}
 		</td>
 		<td>{{liveservice.content}}</td>
-		</tr>
+	</tr>
 	{% endfor %}
+	<!-- TODO: After determining the data storage and retrieval mechanism for contributions via form,
+		 use the below code as a sample for pulling data from a CSV file, or remove. -->
+	{% for submission in site.data.ecosys-submissions %}
+		<!--{% if submission.product_category == "Live Service" %}
+			<tr>
+			<td width="200">
+				{% if submission.product_link == NULL %}
+					{{submission.product_name}}
+				{% else %}
+				<a href={{submission.product_link}}>{{submission.product_name}}</a>
+				{% endif %}
+				</td>
+			<td>{{submission.brief_description}}</td>
+			</tr>
+		{% endif %}
+	{% endfor %}-->
 </tbody>
 </table>
 </div>
 <div id="sdk" class="tab-pane">
 <h2 id="sdk_header">OData SDK - Sample Code</h2>
-The OData SDK includes some sample code to show you how to do everything from create a general purpose OData Explorer to creating OData services and tests that verify that service is producing valid OData.
+<p>The OData SDK includes some sample code to show you how to do everything from create a general purpose OData Explorer to creating OData services and tests that verify that service is producing valid OData.</p>
 <table class="table table-striped table-condensed table-hover" aria-describedby="sdk_header">
 <caption class="sr-only">OData SDK Sample Code</caption>
 <tbody>
@@ -107,35 +170,63 @@ <h2 id="sdk_header">OData SDK - Sample Code</h2>
 			{% endif %}
 		</tr>
 	{% endfor %}
+	<!-- TODO: After determining the data storage and retrieval mechanism for contributions via form,
+		 use the below code as a sample for pulling data from a CSV file, or remove. -->
+	<!--{% for submission in site.data.ecosys-submissions %}
+		{% if submission.product_category == "Sample Code" %}
+			<tr>
+			<td width="200">
+				{% if submission.product_link == NULL %}
+					{{submission.product_name}}
+				{% else %}
+				<a href={{submission.product_link}}>{{submission.product_name}}</a>
+				{% endif %}
+				</td>
+			<td>{{submission.brief_description}}</td>
+			</tr>
+		{% endif %}
+	{% endfor %}-->
 </tbody>
 </table>
 </div>
 <div id="tutorials" class="tab-pane">
 <h2 id="tutorials_header">Tutorials</h2>
+<p>Find tutorials for guidance on building various applications of OData below.</p>
 <table class="table table-striped table-condensed table-hover" aria-describedby="tutorials_header">
 <caption class="sr-only">Tutorials</caption>
 <tbody>
 	{% assign tutorials = site.ecosys | where: "category", "tutorials" %}
 	{% for tutorial in tutorials %}
-		<tr>
+	<tr>
 		<td width="200">
 			{% if tutorial.link == NULL %}
-				{{tutorial.title}}
+			{{tutorial.title}}
 			{% else %}
 			<a href={{tutorial.link}}>{{tutorial.title}}</a>
 			{% endif %}
 		</td>
 		<td>{{tutorial.content}}</td>
-		</tr>
+	</tr>
 	{% endfor %}
+	<!-- TODO: After determining the data storage and retrieval mechanism for contributions via form,
+		 use the below code as a sample for pulling data from a CSV file, or remove. -->
+	<!--{% for submission in site.data.ecosys-submissions %}
+		{% if submission.product_category == "Tutorial" %}
+			<tr>
+			<td width="200">
+				{% if submission.product_link == NULL %}
+					{{submission.product_name}}
+				{% else %}
+				<a href={{submission.product_link}}>{{submission.product_name}}</a>
+				{% endif %}
+				</td>
+			<td>{{submission.brief_description}}</td>
+			</tr>
+		{% endif %}
+	{% endfor %}-->
 </tbody>
 </table>
 </div>
 </div>
 </div>
 </div>
-<div>
-<h4>Contribute to OData Ecosystem</h4>
-Want to add/update information of the OData ecosystem? You can edit and submit changes to this page on its <a href="https://github.com/ODataOrg/odataorg.github.io" target="_blank">Github repository</a>.
-
-</div>
diff --git a/pages/get-started/advanced-tutorial.html b/pages/get-started/advanced-tutorial.html
new file mode 100644
index 00000000..95ecb68f
--- /dev/null
+++ b/pages/get-started/advanced-tutorial.html
@@ -0,0 +1,783 @@
+---
+layout: page
+title: Advanced Tutorial
+date: 2014-08-01 03:53:28.000000000 +08:00
+permalink: /getting-started/advanced-tutorial/
+---
+<div class="row">
+    <div class="col-2-3">
+        <p>
+            The Open Data Protocol (OData) is a data access protocol built on core protocols like HTTP and commonly accepted methodologies like REST for the web. There are various kinds of <a href="https://www.odata.org/libraries/">libraries</a> and <a href="https://www.odata.org/ecosystem/">tools</a> that can be used to consume OData services. But for beginners and those who want to write their own libraries, the pure HTTP requests and responses are also very important. This documentation will not cover every feature details for OData V4 services but will try to cover various typical scenarios. If you want to have a more detailed understanding, please refer to <a href="https://www.odata.org/documentation/">OData Documentation</a>.
+        </p>
+        <h4>Note:</h4>
+        <ul>
+            <li>This is the advanced section. For topics like requesting data, query options, basic data modification, operations and etc, please refer to <a href="https://www.odata.org/getting-started/basic-tutorial/">Basic Section</a>.</li>
+            <li>All these are based on OData V4 sample service <a href="https://services.odata.org/V4/TripPinServiceRW">TripPin</a>, please just replace the <code>serviceRoot</code> below with the URL <code>https://services.odata.org/V4/TripPinServiceRW</code>. TripPin now supports ETag, so for data modification topics, you should first using GET on TripPin (eg. GET serviceRoot/People) to get the section information in the payload then use the URL with section for data modification examples. (something looks like https://services.odata.org/V4/(S(flat4rgegiueineatspfdku1))/TripPinServiceRW)</li>
+            <li>You may use <a href="https://www.telerik.com/fiddler">Fiddler</a> to run the request (especially the complex ones of data modification) and get the JSON response.</li>
+            <li>In TripPin service, ETag is currently enabled on entity <em>Person</em>. We omit the ETag related headers in request headers for short, please go to the <a href="https://www.odata.org/getting-started/basic-tutorial/#etag">ETag Section</a> for detailed information.</li>
+            <li>We will keep improving this by adding contents and fixing bugs. You can provide your feedbacks and ask questions using <a href="https://www.odata.org/join-the-odata-discussion/">OData Mailling List</a>.</li>
+        </ul>
+        <div id="singleton">
+            <h2 class="page-header">Singleton</h2>
+            <p> Singletons are single entities which are accessed as children of the entity container.</p>
+            <div id="querySingleton">
+                <h3>Requesting singleton</h3>
+                <p>
+                    The request below returns the singleton <em>Me</em><br />
+                    <code>GET serviceRoot/Me </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#Me",
+                "@odata.id": "serviceRoot/Me",
+                "@odata.etag": "W/"08D1694EFF498B20"",
+                "@odata.editLink": "serviceRoot/Me",
+                "UserName": "aprilcline",
+                "FirstName": "April",
+                "LastName": "Cline",
+                "EmailAddress": [
+                "April@example.com",
+                "April@contoso.com"
+                ],
+                "AddressInfo": [
+                {
+                "Address": "P.O. Box 555",
+                "City":
+                {
+                "CountryRegion": "United States",
+                "Name": "Lander",
+                "Region": "WY"
+                }
+                }
+                ],
+                "Gender": "Female",
+                "Concurrency": 635404810447326000
+                }
+                {% endhighlight %}
+            </div>
+            <div id="querySingletonProperty">
+                <h3>Requesting property of Singleton </h3>
+                <p>
+                    The request below returns the property <em>AddressInfo</em> of singleton <em>Me</em>.<br />
+                    <code>GET serviceRoot/Me/AddressInfo </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#Me/AddressInfo",
+                "value":
+                [
+                {
+                "Address": "P.O. Box 555",
+                "City":
+                {
+                "CountryRegion": "United States",
+                "Name": "Lander",
+                "Region": "WY"
+                }
+                }
+                ]
+                }
+                {% endhighlight %}
+                <p>
+                </p>
+            </div>
+            <div id="updateSingleton">
+                <h3>Update Singleton</h3>
+                <p>
+                    The request below updates the <em>UserName</em> of Single <em>Me</em>.<br />
+                    <code>
+                        <br />
+                        PATCH serviceRoot/Me<br />
+                        OData-Version: 4.0<br />
+                        Content-Type: application/json;odata.metadata=minimal<br />
+                        Accept: application/json<br />
+                        {<br />
+                        "@odata.type" : "Microsoft.OData.SampleService.Models.TripPin.Person",<br />
+                        "UserName": "AprilTripPin"<br />
+                        }<br />
+                    </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                HTTP/1.1 204 No Content
+                OData-Version: 4.0
+                {% endhighlight %}
+            </div>
+        </div>
+        <div id="derived">
+            <h2 class="page-header">Derived Entity Type</h2>
+            <p> OData now supports derived entity type. Entity types may derived by single inheritance from other entity types. In the sample TripPin service, the entity type <em>Event</em> and <em>Flight</em> both derive from entity type <em>PlanItem</em>.</p>
+            <div id="requestDerived">
+                <h3>Requesting a Derived Entity</h3>
+                <p> The request below returns the flight of with <em>PlanItemId</em> 21.</p>
+                <p>
+                    <code>GET serviceRoot/People('russellwhyte')/Trips(1003)/PlanItems(21)/Microsoft.OData.SampleService.Models.TripPin.Flight</code><br />
+                    <br /> <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#People('russellwhyte')/Trips(1003)/PlanItems/Microsoft.OData.SampleService.Models.TripPin.Flight/$entity",
+                "PlanItemId": 21,
+                "ConfirmationCode": "JH58494",
+                "StartsAt": "2014-02-01T08:00:00+08:00",
+                "EndsAt": "2014-02-01T09:20:00+08:00",
+                "Duration": "PT0S",
+                "SeatNumber": "B11",
+                "FlightNumber": "FM1930"
+                }
+                {% endhighlight %}
+            </div>
+            <div id="requestDerivedEntitySet">
+                <h3>Requesting a Derived Entity Collection</h3>
+                <p>
+                    The request below shows how to get the derived enity set <em>Flights</em>.<br />
+                    <code>GET serviceRoot/People('russellwhyte')/Trips(1001)/PlanItems/Microsoft.OData.SampleService.Models.TripPin.Flight</code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#People('russellwhyte')/Trips(1001)/PlanItems/Microsoft.OData.SampleService.Models.TripPin.Flight",
+                "value": [
+                {
+                "PlanItemId": 11,
+                "ConfirmationCode": "JH58493",
+                "StartsAt": "2014-01-01T08:00:00+08:00",
+                "EndsAt": "2014-01-01T09:20:00+08:00",
+                "Duration": "PT0S",
+                "SeatNumber": null,
+                "FlightNumber": "VA1930"
+                },
+                {
+                "PlanItemId": 13,
+                "ConfirmationCode": "JH58493",
+                "StartsAt": "2014-01-04T13:00:00+08:00",
+                "EndsAt": "2014-01-04T14:20:00+08:00",
+                "Duration": "PT0S",
+                "SeatNumber": null,
+                "FlightNumber": "VA1930"
+                }
+                ]
+                }
+                {% endhighlight %}
+            </div>
+            <div id="filterDerived">
+                <h3>Filter on Derived Type</h3>
+                <p> The two request below shows how to filter on derived entities. These requests return all <em>Flight</em> deriving from <em>PlanItem</em> which has <em>FlightNumber</em> as 'VA1930'.</p>
+                <p>
+                    <code>serviceRoot/People('russellwhyte')/Trips(1001)/PlanItems?$filter=Microsoft.OData.SampleService.Models.TripPin.Flight/FlightNumber eq 'VA1930'</code><br />
+                    <code>serviceRoot/People('russellwhyte')/Trips(1001)/PlanItems/Microsoft.OData.SampleService.Models.TripPin.Flight?$filter=FlightNumber eq 'VA1930'</code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#People('russellwhyte')/Trips(1001)/PlanItems/Microsoft.OData.SampleService.Models.TripPin.Flight",
+                "value": [
+                {
+                "PlanItemId": 11,
+                "ConfirmationCode": "JH58493",
+                "StartsAt": "2014-01-01T08:00:00+08:00",
+                "EndsAt": "2014-01-01T09:20:00+08:00",
+                "Duration": "PT0S",
+                "SeatNumber": null,
+                "FlightNumber": "VA1930"
+                },
+                {
+                "PlanItemId": 13,
+                "ConfirmationCode": "JH58493",
+                "StartsAt": "2014-01-04T13:00:00+08:00",
+                "EndsAt": "2014-01-04T14:20:00+08:00",
+                "Duration": "PT0S",
+                "SeatNumber": null,
+                "FlightNumber": "VA1930"
+                }
+                ]
+                }
+                {% endhighlight %}
+            </div>
+            <div id="createDerived">
+                <h3>Create a Derived Entity</h3>
+                <p>
+                    The request below creates an event entity in trips. <em>Event</em> derives from <em>PlanItem</em>.<br />
+                    <code>
+                        <br />
+                        POST serviceRoot/People("russellwhyte")/Trips(1003)/PlanItems<br />
+                        OData-Version: 4.0<br />
+                        Content-Type: application/json
+                        ;
+                        odata.metadata=minimal<br />
+                        Accept: application/json
+                        {<br />
+                        "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Event",<br />
+                        "ConfirmationCode": "4372899DD",<br />
+                        "Description": "Client Meeting",<br />
+                        "Duration": "PT3H",<br />
+                        "EndsAt": "2014-06-01T23:11:17.5479185-07:00",<br />
+                        "OccursAt": {<br />
+                        "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.EventLocation",<br />
+                        "Address": "100 Church Street, 8th Floor, Manhattan, 10007",<br />
+                        "BuildingInfo": "Regus Business Center",<br />
+                        "City": {<br />
+                        "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.City",<br />
+                        "CountryRegion": "United States",<br />
+                        "Name": "New York City",<br />
+                        "Region": "New York"<br />
+                        }<br />
+                        },<br />
+                        "PlanItemId": 33,<br />
+                        "StartsAt": "2014-05-25T23:11:17.5459178-07:00"<br />
+                        }<br />
+                    </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                Response HTTP/1.1 201 Created
+                {
+                "@odata.context": "serviceRoot/$metadata#People('russellwhyte')/Trips(1003)/PlanItems/$entity",
+                "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Event",
+                "PlanItemId": 33,
+                "ConfirmationCode": "4372899DD",
+                "StartsAt": "2014-05-25T23:11:17.5459178-07:00",
+                "EndsAt": "2014-06-01T23:11:17.5479185-07:00",
+                "Duration": "PT3H",
+                "Description": "Client Meeting",
+                "OccursAt": {
+                "Address": "100 Church Street, 8th Floor, Manhattan, 10007",
+                "City": {
+                "CountryRegion": "United States",
+                "Name": "New York City",
+                "Region": "New York"
+                },
+                "BuildingInfo": "Regus Business Center"
+                }
+                }
+                {% endhighlight %}
+            </div>
+            <div id="updateDerived">
+                <h3>Update a Derived Entity</h3>
+                <p>
+                    The request below updates an event. <em>Event</em> derives from <em>PlanItem</em>.<br />
+                    <code>
+                        <br />
+                        PATCH serviceRoot/People('russellwhyte')/Trips(1003)/PlanItems(5)/Microsoft.OData.SampleService.Models.TripPin.Event<br />
+                        OData-Version: 4.0<br />
+                        Content-Type: application/json;odata.metadata=minimal<br />
+                        Accept: application/json
+                        {<br />
+                        "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Event",<br />
+                        "Description": "This is a new description"<br />
+                        }<br />
+                    </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                HTTP/1.1 204 No Content
+                {% endhighlight %}
+            </div>
+            <div id="deleteDerived">
+                <h3>Delete a Derived Entity</h3>
+                <p> The request below deletes the flight plan item with Id '21' from a trip of person. <em>Flight</em> derives from <em>PlanItem</em>.</p>
+                <p>
+                    <code>DELETE serviceRoot/People('russellwhyte')/Trips(1003)/PlanItems(21)/Microsoft.OData.SampleService.Models.TripPin.Flight</code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                HTTP/1.1 204 No Content
+                {% endhighlight %}
+            </div>
+        </div>
+        <div id="containment">
+            <h2 class="page-header">Containment Navigation Property</h2>
+            <p> Containment navigation properties define an implicit entity set for each instance of its declaring entity type. This implicit entity set if identified by the read URL of the navigation property for that entity. The request below returns the contained navigation property <em>Trips</em> of entity set <em>People</em>.</p>
+            <div id="queryContianed">
+                <h3>Requesting a Contained Entity Set</h3>
+                <p>
+                    The request below returns <em>Trips</em> for a person where <em>Trips</em> is a containment navigation property for <em>Person</em>.<br />
+                    <code>GET serviceRoot/People('russellwhyte')/Trips </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "https://services.odata.org/V4/(S(mmobft3g4aut3krzqrxxip4w))/TripPinServiceRW/$metadata#People('russellwhyte')/Trips",
+                "value": [
+                {
+                "TripId": 1001,
+                "ShareId": "9d9b2fa0-efbf-490e-a5e3-bac8f7d47354",
+                "Description": "Trip from San Francisco to New York City",
+                "Name": "Trip in US",
+                "Budget": 3000,
+                "StartsAt": "2014-01-01T00:00:00Z",
+                "EndsAt": "2014-01-04T00:00:00Z",
+                "Tags": [
+                "business",
+                "New York meeting"
+                ]
+                },
+                ......
+                ,
+                {
+                "TripId": 1007,
+                "ShareId": "9ce142c3-5fd6-4a71-848e-5220ebf1e9f3",
+                "Description": "Happy honeymoon trip",
+                "Name": "Honeymoon",
+                "Budget": 2650,
+                "StartsAt": "2014-02-01T00:00:00Z",
+                "EndsAt": "2014-02-04T00:00:00Z",
+                "Tags": [
+                "Travel",
+                "honeymoon"
+                ]
+                }
+                ]
+                }
+                {% endhighlight %}
+            </div>
+            <div id="createContain">
+                <h3>Create a Contained Entity</h3>
+                <p>
+                    The request below creates a <em>Trip</em> for <em>Person</em> with <em>UserName</em> 'russellwhyte'. <em>Trips</em> is a contained navigation property for <em>Person</em>.<br />
+                    <code>
+                        <br />
+                        POST serviceRoot/People('russellwhyte')/Trips<br />
+                        OData-Version: 4.0<br />
+                        Content-Type: application/json;odata.metadata=minimal<br />
+                        Accept: application/json<br />
+                        {<br />
+                        "@odata.type" : "Microsoft.OData.SampleService.Models.TripPin.Trip",<br />
+                        "TripId" : 3,<br />
+                        "ShareId" : null,<br />
+                        "Description" : "Create Containment",<br />
+                        "Name" : "Test Trip",<br />
+                        "StartsAt" : "2014-01-01T00:00:00+08:00",<br />
+                        "EndsAt" : "2014-02-01T00:00:00+08:00",<br />
+                        "Budget" : 1000,<br />
+                        "Tags" : [<br />
+                        "Test Tag 1",<br />
+                        "Test Tag 2"<br />
+                        ]<br />
+                        }<br />
+                    </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                HTTP/1.1 201 Created
+                Content-Length: 344
+                Content-Type: application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8
+                Location: serviceRoot/People('russellwhyte')/Trips(3)
+                OData-Version: 4.0
+                {
+                "@odata.context":"serviceRoot/$metadata#People('russellwhyte')/Trips/$entity",
+                "TripId":3,
+                "ShareId":"00000000-0000-0000-0000-000000000000",
+                "Description":"Create Containment",
+                "Name":"Test Trip",
+                "Budget":1000,
+                "StartsAt":"2014-01-01T00:00:00+08:00",
+                "EndsAt":"2014-02-01T00:00:00+08:00",
+                "Tags":["Test Tag 1","Test Tag 2"]
+                }
+                {% endhighlight %}
+            </div>
+            <div id="filterContain">
+                <h3>Filter on a Contained Entity Set</h3>
+                <p>
+                    The request below returns <em>Trips</em> that contains 'New York' in its description of <em>Person</em> with <em>UserName</em> 'russellwhyte'.<br />
+                    <code>GET serviceRoot/People('russellwhyte')/Trips?$filter=contains(Description, 'New York')</code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#People('russellwhyte')/Trips",
+                "value": [
+                {
+                "TripId": 1001,
+                "ShareId": "9d9b2fa0-efbf-490e-a5e3-bac8f7d47354",
+                "Description": "Trip from San Francisco to New York City",
+                "Name": "Trip in US",
+                "Budget": 3000,
+                "StartsAt": "2014-01-01T00:00:00+08:00",
+                "EndsAt": "2014-01-04T00:00:00+08:00",
+                "Tags": [
+                "business",
+                "New York meeting"
+                ]
+                }
+                ]
+                }
+                {% endhighlight %}
+            </div>
+            <div id="updateContainment">
+                <h3>Update Contained Entity</h3>
+                <p>
+                    The request below updates the contained Entity <em>Trip</em>.<br />
+                    <code>
+                        <br />
+                        PATCH serviceRoot/People('russellwhyte')/Trips(1001)<br />
+                        OData-Version: 4.0<br />
+                        Content-Type: application/json;odata.metadata=minimal<br />
+                        Accept: application/json
+                        {<br />
+                        "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Trip",<br />
+                        "Description": "This is a new description"<br />
+                        }<br />
+                    </code>
+                </p>
+                <p> Response Payload</p>
+                {% highlight javascript%}
+                HTTP/1.1 204 No Content
+                {% endhighlight %}
+            </div>
+            <div id="deleteContaiment">
+                <h3>Delete Contained Entity</h3>
+                <p> The request below deletes a contained Entity <em>Trip</em>. </p>
+                <p>
+                    <code>DELETE serviceRoot/People('russellwhyte')/Trips(1001)</code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                HTTP/1.1 204 No Content
+                {% endhighlight %}
+            </div>
+        </div>
+        <div id="openType">
+            <h2 class="page-header">Open Type</h2>
+            <p> OData V4 supports entity or complex types which allow clients to persist additional undeclared properties. Such entities and complex types are called open types.</p>
+            <div id="openEntity">
+                <h3>Open Entity Type</h3>
+                <p>
+                    When create or update an open entity, undeclared properties can be added.<br />
+                    The request below shows how to add an undeclared property <em>Description</em> when create the open entity <em>Person</em>.<br />
+                    <code>
+                        <br />
+                        POST serviceRoot/People<br />
+                        OData-Version: 4.0<br />
+                        Content-Type: application/json;odata.metadata=minimal<br />
+                        Accept: application/json<br />
+                        ETag: W/"08D15F3DD9126D84"
+                        {<br />
+                        "@odata.type" : "Microsoft.OData.SampleService.Models.TripPin.Person",<br />
+                        "UserName": "teresa",<br />
+                        "FirstName" : "Teresa",<br />
+                        "LastName" : "Gilbert",<br />
+                        "Gender" : "Female",<br />
+                        "Description": "Big fan for travelling",<br />
+                        "Emails" : ["teresa@example.com", "teresa@contoso.com"],<br />
+                        "AddressInfo" : [<br />
+                        {<br />
+                        "Address" : "1 Suffolk Ln.",<br />
+                        "City" :<br />
+                        {<br />
+                        "CountryRegion" : "United States",<br />
+                        "Name" : "Boise",<br />
+                        "Region" : "ID"<br />
+                        }<br />
+                        }]<br />
+                        }<br />
+                    </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                HTTP/1.1 201 Created
+                {
+                "@odata.context":"serviceRoot/$metadata#People/$entity",
+                "@odata.id":"serviceRoot/People('teresa')",
+                "@odata.editLink":"serviceRoot/People('teresa')",
+                "UserName":"teresa",
+                "FirstName":"Teresa",
+                "LastName":"Gilbert",
+                "Description": "Big fan for travelling",
+                "Emails":["teresa@example.com","teresa@contoso.com"],
+                "AddressInfo":[{"Address":"1 Suffolk Ln.","City":{"CountryRegion":"United States","Name":"Boise","Region":"ID"}}],
+                "Gender":"Female"
+                }
+                {% endhighlight %}
+                <p>
+                    The request below shows how to add an undeclared property <em>Description</em> when update the open entity <em>Person</em>.<br />
+                    <code>
+                        <br />
+                        PATCH serviceRoot/People('keithpinckney')<br />
+                        OData-Version: 4.0<br />
+                        Content-Type: application/json;odata.metadata=minimal<br />
+                        Accept: application/json
+                        {<br />
+                        "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Person",<br />
+                        "Description": "Big fan for travelling"<br />
+                        }<br />
+                        <br />
+                        Response Payload<br />
+                    </code>
+                    {% highlight javascript%}
+                    HTTP/1.1 204 No Content
+                    {% endhighlight %}
+                </p>
+            </div>
+            <div id="openComplex">
+                <h3>Open Complex Type</h3>
+                <p>
+                    OData V4 also supports open type for complex types.<br />
+                    The request below show how to add undeclared property <em>Description</em> when create new instance with <em>AddressInfo</em> of open complex type <em>Location</em>.
+                </p>
+                <p>
+                    <code>
+                        <br />
+                        PATCH serviceRoot/People('russellwhyte')<br />
+                        OData-Version: 4.0<br />
+                        Content-Type: application/json;odata.metadata=minimal<br />
+                        Accept: application/json
+                        {<br />
+                        "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Person",<br />
+                        "AddressInfo@odata.type": "#Collection(Microsoft.OData.SampleService.Models.TripPin.Location)",<br />
+                        "AddressInfo": [<br />
+                        {<br />
+                        "Address": "187 Suffolk Ln.",<br />
+                        "City": {<br />
+                        "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.City",<br />
+                        "CountryRegion": "United States",<br />
+                        "Name": "Boise",<br />
+                        "Region": "ID"<br />
+                        },<br />
+                        "Description": null<br />
+                        },<br />
+                        {<br />
+                        "Address": "XuanWu Load 555",<br />
+                        "City": {<br />
+                        "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.City",<br />
+                        "CountryRegion": "China",<br />
+                        "Name": "NanJing",<br />
+                        "Region": "JiangSu"<br />
+                        },<br />
+                        "Description": "Nice Location"<br />
+                        }<br />
+                        ],<br />
+                        "Concurrency": 635393824693486800,<br />
+                        "Description": null,<br />
+                        "Emails@odata.type": "#Collection(String)",<br />
+                        "Emails": [<br />
+                        "Russell@example.com",<br />
+                        "Russell@contoso.com"<br />
+                        ],<br />
+                        "FirstName": "Russell",<br />
+                        "Gender@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.PersonGender",<br />
+                        "Gender": "Male",<br />
+                        "LastName": "Whyte",<br />
+                        "UserName": "russellwhyte"<br />
+                        }<br />
+                    </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                HTTP/1.1 204 No Content
+                {% endhighlight %}
+                <p>
+                    The request below show how to add undeclared property <em>Description</em> when update an instance with <em>OccursAt</em> of open complex type <em>EventLocation</em>.
+                </p>
+                <p>
+                    <code>PATCH serviceRoot/People('russellwhyte')/Trips(1003)/PlanItems(5)/Microsoft.OData.SampleService.Models.TripPin.Event</code><br />
+                    <code>
+                        <br />
+                        OData-Version: 4.0<br />
+                        Content-Type: application/json;odata.metadata=minimal<br />
+                        Accept: application/json
+                        {<br />
+                        "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Event",<br />
+                        "OccursAt": {<br />
+                        "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.EventLocation",<br />
+                        "Address": "10 Beijing Street, 100000",<br />
+                        "BuildingInfo": "Beijing Restaurant",<br />
+                        "City": {<br />
+                        "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.City",<br />
+                        "CountryRegion": "China",<br />
+                        "Name": "Beijing",<br />
+                        "Region": "Beijing"<br />
+                        },<br />
+                        "Description": "Beautiful City."<br />
+                        }<br />
+                        }<br />
+                    </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                HTTP/1.1 204 No Content
+                {% endhighlight %}
+            </div>
+        </div>
+        <div id="batch">
+            <h2 class="page-header">Batch</h2>
+            <p>
+                Batch requests allow grouping multiple operations into a single HTTP request payload. The Batch request below contains the following operations in order listed:<br />
+                &nbsp;&nbsp;&nbsp;&nbsp;1. A query request, returns all <em>Airlines</em>.<br />
+                &nbsp;&nbsp;&nbsp;&nbsp;2. Create an entity, a new <em>Airline</em>.<br />
+                &nbsp;&nbsp;&nbsp;&nbsp;3. A second query request <em>Airlines</em>.
+            </p>
+            <p>
+                <code>
+                    <br />
+                    POST serviceRoot/$batch<br />
+                    OData-Version: 4.0<br />
+                    Content-Type: multipart/mixed;boundary=batch_36522ad7-fc75-4b56-8c71-56071383e77b<br />
+                </code>
+            </p>
+            <p>
+                <code>
+                    <br />
+                    --batch_36522ad7-fc75-4b56-8c71-56071383e77b<br />
+                    Content-Type: application/http<br />
+                    Content-Transfer-Encoding:binary
+                    GET serviceRoot/Airlines HTTP/1.1<br />
+                    Accept: application/json;odata.metadata=minimal
+                    --batch_36522ad7-fc75-4b56-8c71-56071383e77b<br />
+                    Content-Type: application/http<br />
+                    Content-Transfer-Encoding:binary<br />
+                    Content-ID: 1
+                    POST serviceRoot/Airlines HTTP/1.1<br />
+                    OData-Version: 4.0<br />
+                    Content-Type: application/json;odata.metadata=minimal<br />
+                    Accept: application/json;odata.metadata=minimal
+                    {<br />
+                    "@odata.type" : "Microsoft.OData.SampleService.Models.TripPin.Airline",<br />
+                    "AirlineCode" : "EK",<br />
+                    "Name" : "Emirates Airline"<br />
+                    }
+                    --batch_36522ad7-fc75-4b56-8c71-56071383e77b<br />
+                    Content-Type: application/http<br />
+                    Content-Transfer-Encoding:binary
+                    GET serviceRoot/Airlines HTTP/1.1<br />
+                    Accept: application/json;odata.metadata=minimal
+                    --batch_36522ad7-fc75-4b56-8c71-56071383e77b--
+                </code><br />
+                <br />
+                Response Payload
+                {% highlight javascript%}
+                HTTP/1.1 200 OK
+                Cache-Control: no-cache
+                Content-Length: 3100
+                Content-Type: multipart/mixed; boundary=batchresponse_3e4cf86f-ab02-46e1-9631-b08a787abc35
+                OData-Version: 4.0
+                --batchresponse_3e4cf86f-ab02-46e1-9631-b08a787abc35
+                Content-Type: application/http
+                Content-Transfer-Encoding: binary
+                HTTP/1.1 200 OK
+                OData-Version: 4.0
+                Content-Type: application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8
+                {
+                "@odata.context":"serviceRoot/$metadata#Airlines",
+                "value":
+                [{
+                "AirlineCode":"AA",
+                "Name":"American Airlines"
+                },
+                {
+                "AirlineCode":"FM",
+                "Name":"Shanghai Airline"
+                },
+                {
+                "AirlineCode":"MU",
+                "Name":"China Eastern Airlines"
+                }
+                ]}
+                --batchresponse_3e4cf86f-ab02-46e1-9631-b08a787abc35
+                Content-Type: application/http
+                Content-Transfer-Encoding: binary
+                HTTP/1.1 201 Created
+                Location: serviceRoot/Airlines('EK')
+                OData-Version: 4.0
+                Content-Type: application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8
+                {
+                "@odata.context":"serviceRoot/$metadata#Airlines/$entity",
+                "@odata.id":"serviceRoot/Airlines('EK')",
+                "@odata.editLink":"serviceRoot/Airlines('EK')",
+                "AirlineCode":"EK","Name":"Emirates Airline"
+                }
+                --batchresponse_3e4cf86f-ab02-46e1-9631-b08a787abc35
+                Content-Type: application/http
+                Content-Transfer-Encoding: binary
+                HTTP/1.1 200 OK
+                OData-Version: 4.0
+                Content-Type: application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8
+                {
+                "@odata.context":"serviceRoot/$metadata#Airlines",
+                "value":
+                [{
+                "AirlineCode":"AA",
+                "Name":"American Airlines"},
+                {
+                "AirlineCode":"FM",
+                "Name":"Shanghai Airline"
+                },
+                {
+                "AirlineCode":"MU",
+                "Name":"China Eastern Airlines"
+                },
+                {
+                "AirlineCode":"EK",
+                "Name":"Emirates Airline"
+                }]
+                }
+                --batchresponse_3e4cf86f-ab02-46e1-9631-b08a787abc35--
+                {% endhighlight %}
+        </div>
+    </div>
+    <div class="col-1-4" style="float:right">
+        <nav class="tutorial-sidebar" aria-label="Page Contents">
+            <ul class="nav tutorial-sidenav" data-spy="affix">
+                <li class="active">
+                    <a href="#singleton">Singleton</a>
+                    <ul class="nav">
+                        <li><a href="#querySingleton">Requesting Singleton</a></li>
+                        <li><a href="#querySingletonProperty">Requesting Property of Singleton Property</a></li>
+                        <li><a href="#updateSingleton">Update Singleton</a></li>
+                    </ul>
+                </li>
+                <li>
+                    <a href="#derived">Derived Entity Type</a>
+                    <ul class="nav">
+                        <li><a href="#requestDerivedEntitySet">Requesting a Derived Entity Collection</a></li>
+                        <li><a href="#requestDerived">Requesting a Derived Entity</a></li>
+                        <li><a href="#filterDerived">Querying on Derived Entities</a></li>
+                        <li><a href="#createDerived">Create a Derived Entity</a></li>
+                        <li><a href="#updateDerived">Update a Derived Entity</a></li>
+                        <li><a href="#deleteDerived">Delete a Derived Entity</a></li>
+                    </ul>
+                </li>
+                <li>
+                    <a href="#containment">Containment Navigation Property</a>
+                    <ul class="nav">
+                        <li><a href="#queryContained">Requesting a Contained Entity Set</a></li>
+                        <li><a href="#createContain">Create a Contained Entity</a></li>
+                        <li><a href="#filterContain">Filter on a Contained Entity Set</a></li>
+                        <li><a href="#updateContainment">Update a Contained Entity</a></li>
+                        <li><a href="#deleteContainment">Delete a Contained Entity</a></li>
+                    </ul>
+                </li>
+                <li>
+                    <a href="#openType">Open Type</a>
+                    <ul class="nav">
+                        <li><a href="#openEntity">Open Entity Type</a></li>
+                        <li><a href="#openComplex">Open Complex Type</a></li>
+                    </ul>
+                </li>
+                <li>
+                    <a href="#batch">Batch</a>
+                </li>
+            </ul>
+        </nav>
+    </div>
+    <div class="col-1-12"></div>
+</div>
\ No newline at end of file
diff --git a/pages/get-started/basic-tutorial.html b/pages/get-started/basic-tutorial.html
new file mode 100644
index 00000000..8eb92a66
--- /dev/null
+++ b/pages/get-started/basic-tutorial.html
@@ -0,0 +1,1163 @@
+---
+layout: page
+title: Basic Tutorial
+date: 2014-08-01 03:44:56.000000000 +08:00
+permalink: /getting-started/basic-tutorial/
+---
+<!--body data-spy="scroll" data-target="nav"-->
+<div class="row">
+    <div class="col-2-3">
+        <p>The Open Data Protocol (OData) is a data access protocol built on core protocols like HTTP and commonly accepted methodologies like REST for the web. There are various kinds of <a href="https://www.odata.org/libraries/">libraries</a> and <a href="https://www.odata.org/ecosystem/">tools</a>  can be used to consume OData services. But for beginners and those who want to write their own libraries, the pure HTTP requests and responses are also very important. This documentation will not cover every feature details for OData V4 services but will try to cover various typical scenarios.  If you want to have a more detailed understanding, please refer to <a href="https://www.odata.org/documentation/">OData Documentation</a>. </p>
+        <p>You can now use the <b><a href="/getting-started/learning-odata-on-postman">Postman collections</a></b> to learn OData in an interactive way.</p>
+        <h4>Note:</h4>
+        <ul>
+            <li>This is the Basic section. For topics like Singleton, Inheritance, Open Type, Containment and Batch, please refer to <a href="https://www.odata.org/getting-started/advanced-tutorial/">Advanced Section</a>.</li>
+            <li>All these are based on OData V4 sample service <a href="https://services.odata.org/V4/TripPinServiceRW">TripPin</a>, please just replace the <code>serviceRoot</code> below with the URL <code>https://services.odata.org/V4/TripPinServiceRW</code>. TripPin now supports ETag, so for data modification topics, you should first using GET on TripPin (eg. GET serviceRoot/People) to get the section information in the payload then use the URL with section for data modification examples. (something looks like <code>https://services.odata.org/V4/(S(flat4rgegiueineatspfdku1))/TripPinServiceRW)</code></li>
+            <li>You may use <a href="https://www.telerik.com/fiddler">Fiddler</a> to run the request (especially the complex ones of data modification) and get the JSON response.</li>
+            <li>In TripPin service, ETag is currently enabled on entity <em>Person</em>. We omit the ETag related headers in request headers for short, please go to the <a href="https://www.odata.org/getting-started/basic-tutorial/#etag">ETag Section</a> for detailed information.</li>
+            <li>We will keep improving this by adding contents and fixing bugs. You can provide your feedbacks and ask questions using <a href="https://www.odata.org/join-the-odata-discussion/">OData Mailling List</a>.</li>
+        </ul>
+        <div id="requestData">
+            <h2 class="page-header">Requesting Data</h2>
+            <p>OData services support requests for data via HTTP <code>GET</code> requests.</p>
+            <div id="entitySet">
+                <h3>Requesting Entity Collections</h3>
+                <p>
+                    The request below returns the the collection of Person <em>People</em>.<br />
+                    <code>GET serviceRoot/People </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#People",
+                "@odata.nextLink": "serviceRoot/People?%24skiptoken=8",
+                "value": [
+                {
+                "@odata.id": "serviceRoot/People('russellwhyte')",
+                "@odata.etag": "W/"08D1694BD49A0F11"",
+                "@odata.editLink": "serviceRoot/People('russellwhyte')",
+                "UserName": "russellwhyte",
+                "FirstName": "Russell",
+                "LastName": "Whyte",
+                "Emails": [
+                "Russell@example.com",
+                "Russell@contoso.com"
+                ],
+                "AddressInfo": [
+                {
+                "Address": "187 Suffolk Ln.",
+                "City": {
+                "CountryRegion": "United States",
+                "Name": "Boise",
+                "Region": "ID"
+                }
+                }
+                ],
+                "Gender": "Male",
+                "Concurrency": 635404796846280400
+                },
+                ......
+                ,
+                {
+                "@odata.id": "serviceRoot/People('keithpinckney')",
+                "@odata.etag": "W/"08D1694BD49A0F11"",
+                "@odata.editLink": "serviceRoot/People('keithpinckney')",
+                "UserName": "keithpinckney",
+                "FirstName": "Keith",
+                "LastName": "Pinckney",
+                "Emails": [
+                "Keith@example.com",
+                "Keith@contoso.com"
+                ],
+                "AddressInfo": [],
+                "Gender": "Male",
+                "Concurrency": 635404796846280400
+                }
+                ]
+                }
+                {% endhighlight %}
+                </p>
+            </div>
+            <div id="entityByID">
+                <h3>Requesting an Individual Entity by ID</h3>
+                <p>
+                    The request below returns an individual entity of type <em>Person</em> by the given UserName "russellwhyte"<br />
+                    <code>GET serviceRoot/People('russellwhyte') </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#People/$entity",
+                "@odata.id": "serviceRoot/People('russellwhyte')",
+                "@odata.etag": "W/"08D1694BF26D2BC9"",
+                "@odata.editLink": "serviceRoot/People('russellwhyte')",
+                "UserName": "russellwhyte",
+                "FirstName": "Russell",
+                "LastName": "Whyte",
+                "Emails": [
+                "Russell@example.com",
+                "Russell@contoso.com"
+                ],
+                "AddressInfo": [
+                {
+                "Address": "187 Suffolk Ln.",
+                "City": {
+                "CountryRegion": "United States",
+                "Name": "Boise",
+                "Region": "ID"
+                }
+                }
+                ],
+                "Gender": "Male",
+                "Concurrency": 635404797346655200
+                }
+                {% endhighlight %}
+                </p>
+            </div>
+            <div id="property">
+                <h3>Requesting an Individual Property</h3>
+                <p>
+                    To address an entity property clients append a path segment containing property name to the URL of the entity. If the property has a complex type, properties of that value can be addressed by further property name composition.<br />
+                    First let's take a look at how to get a simple property. The request below returns the <em>Name</em> property of an <em>Airport</em>.
+                </p>
+                <p>
+                    <code>GET serviceRoot/Airports('KSFO')/Name </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#Airports('KSFO')/Name",
+                "value": "San Francisco International Airport"
+                }
+                {% endhighlight %}
+                <p>
+                    Then let's see how to get a property value of a complex type. The request below returns the <em>Address</em> of the complex type <em>Location</em> in an <em>Airport</em>.<br />
+                    <code>GET serviceRoot/Airports('KSFO')/Location/Address </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#Airports('KSFO')/Location/Address",
+                "value": "South McDonnell Road, San Francisco, CA 94128"
+                }
+                {% endhighlight %}
+                </p>
+            </div>
+            <div id="propertyVal">
+                <h3>Requesting an Individual Property Raw Value</h3>
+                <p>
+                    To address the raw value of a primitive property, clients append a path segment containing the string <code>$value</code> to the property URL. The request below returns the raw value of property <em>Name</em> of an <em>Airport</em>.<br />
+                    <code>GET serviceRoot/Airports('KSFO')/Name/$value </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                San Francisco International Airport
+                {% endhighlight %}
+                </p>
+            </div>
+            </p>
+        </div>
+        <div id="queryData">
+            <h2 class="page-header">Querying Data</h2>
+            <p>            OData supports various kinds of query options for querying data. This section will help you go through the common scenarios for these query options.</p>
+            <div id="filter">
+                <h3>System Query Option $filter</h3>
+                <p>                The <code>$filter</code> system query option allows clients to filter a collection of resources that are addressed by a request URL. The expression specified with <code>$filter</code> is evaluated for each resource in the collection, and only items where the expression evaluates to true are included in the response.</p>
+                <div id="basic">
+                    <h4>Basic predicates, built-in functions</h4>
+                    <p>
+                        There are several kinds of basic predicates and built-in functions for <code>$filter</code>, including logical operators and arithmetic operators. For more detailed information, please refer to <a href="https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part2-url-conventions.html">OData V4 URL Conventions Document</a>. The request below using <code>$filter</code> to get people with FirstName "Scott".<br />
+                        <code>GET serviceRoot/People?$filter=FirstName eq 'Scott'</code><br />
+                        <br />
+                        Response Payload
+                    </p>
+                    {% highlight javascript%}
+                    {
+                    "@odata.context": "serviceRoot/$metadata#People",
+                    "value": [
+                    {
+                    "@odata.id": "serviceRoot/People('scottketchum')",
+                    "@odata.etag": "W/"08D1694C7E510464"",
+                    "@odata.editLink": "serviceRoot/People('scottketchum')",
+                    "UserName": "scottketchum",
+                    "FirstName": "Scott",
+                    "LastName": "Ketchum",
+                    "Emails": [
+                    "Scott@example.com"
+                    ],
+                    "AddressInfo": [
+                    {
+                    "Address": "2817 Milton Dr.",
+                    "City": {
+                    "CountryRegion": "United States",
+                    "Name": "Albuquerque",
+                    "Region": "NM"
+                    }
+                    }
+                    ],
+                    "Gender": "Male",
+                    "Concurrency": 635404799693620400
+                    }
+                    ]
+                    }
+                    {% endhighlight %}
+                    </p>
+                </div>
+                <div id="complexType">
+                    <h4>Filter on Complex Type</h4>
+                    <p>                    <code>$filter</code> can also work on complex type. The request below returns airports with "San Francisco" contained in its <em>Address</em>. And <em>Address</em> is property of complex type <em>Location</em>.</p>
+                    <p>
+                        <code>GET serviceRoot/Airports?$filter=contains(Location/Address, 'San Francisco')</code><br />
+                        <br />
+                        Response Payload
+                    </p>
+                    {% highlight javascript%}
+                    {
+                    "@odata.context": "serviceRoot/$metadata#Airports",
+                    "value": [
+                    {
+                    "@odata.id": "serviceRoot/Airports('KSFO')",
+                    "@odata.editLink": "serviceRoot/Airports('KSFO')",
+                    "IcaoCode": "KSFO",
+                    "Name": "San Francisco International Airport",
+                    "IataCode": "SFO",
+                    "Location": {
+                    "Address": "South McDonnell Road, San Francisco, CA 94128",
+                    "City": {
+                    "CountryRegion": "United States",
+                    "Name": "San Francisco",
+                    "Region": "California"
+                    },
+                    "Loc": {
+                    "type": "Point",
+                    "coordinates": [
+                    -122.374722222222,
+                    37.6188888888889
+                    ],
+                    "crs": {
+                    "type": "name",
+                    "properties": {
+                    "name": "EPSG:4326"
+                    }
+                    }
+                    }
+                    }
+                    }
+                    ]
+                    }
+                    {% endhighlight %}
+                    </p>
+                </div>
+                <div id="filterEnum">
+                    <h4>Filter on Enum Properties</h4>
+                    <p>
+                        The request below returns all female People of entity type <em>Person</em>. The <em>Gender</em> is a property of <code>Enum</code> type.<br />
+                        <code>GET serviceRoot/People?$filter=Gender eq Microsoft.OData.SampleService.Models.TripPin.PersonGender'Female' </code><br />
+                        <br />
+                        Response Payload
+                    </p>
+                    {% highlight javascript%}
+                    {
+                    "@odata.context": "serviceRoot/$metadata#People",
+                    "@odata.nextLink": "serviceRoot/People?%24filter=Gender+eq+Microsoft.OData.SampleService.Models.TripPin.PersonGender%27Female%27&%24skiptoken=8",
+                    "value": [
+                    {
+                    "@odata.id": "serviceRoot/People('elainestewart')",
+                    "@odata.etag": "W/"08D1694CCFB34453"",
+                    "@odata.editLink": "serviceRoot/People('elainestewart')",
+                    "UserName": "elainestewart",
+                    "FirstName": "Elaine",
+                    "LastName": "Stewart",
+                    "Emails": [
+                    "Elaine@example.com",
+                    "Elaine@contoso.com"
+                    ],
+                    "AddressInfo": [],
+                    "Gender": "Female",
+                    "Concurrency": 635404801059013800
+                    },
+                    ......
+                    ,
+                    {
+                    "@odata.id": "serviceRoot/People('ursulabright')",
+                    "@odata.etag": "W/"08D1694CCFB34453"",
+                    "@odata.editLink": "serviceRoot/People('ursulabright')",
+                    "UserName": "ursulabright",
+                    "FirstName": "Ursula",
+                    "LastName": "Bright",
+                    "Emails": [
+                    "Ursula@example.com",
+                    "Ursula@contoso.com"
+                    ],
+                    "AddressInfo": [],
+                    "Gender": "Female",
+                    "Concurrency": 635404801059013800
+                    }
+                    ]
+                    }
+                    {% endhighlight %}
+                    </p>
+                </div>
+                <div id="nestedFilter">
+                    <h4>Nested Filter in Expand</h4>
+                    <p>
+                        OData V4 supports nested filters in <code>$expand</code>. The request below return <em>People</em> and all their trips with Name "Trip in US".<br />
+                        <code>GET serviceRoot/People?$expand=Trips($filter=Name eq 'Trip in US')</code><br />
+                        <br />
+                        Response Payload
+                    </p>
+                    {% highlight javascript%}
+                    {
+                    "@odata.context": "serviceRoot/$metadata#People",
+                    "@odata.nextLink": "serviceRoot/People?%24expand=Trips(%24filter%3dName+eq+%27Trip+in+US%27)&%24skiptoken=8",
+                    "value": [
+                    {
+                    "@odata.id": "serviceRoot/People('russellwhyte')",
+                    "@odata.etag": "W/"08D1694D0DBBD9DB"",
+                    "@odata.editLink": "serviceRoot/People('russellwhyte')",
+                    "UserName": "russellwhyte",
+                    "FirstName": "Russell",
+                    "LastName": "Whyte",
+                    "Emails": [
+                    "Russell@example.com",
+                    "Russell@contoso.com"
+                    ],
+                    "AddressInfo": [
+                    {
+                    "Address": "187 Suffolk Ln.",
+                    "City": {
+                    "CountryRegion": "United States",
+                    "Name": "Boise",
+                    "Region": "ID"
+                    }
+                    }
+                    ],
+                    "Gender": "Male",
+                    "Concurrency": 635404802099763700,
+                    "Trips@odata.context": "serviceRoot/$metadata#People('russellwhyte')/Trips",
+                    "Trips": [
+                    {
+                    "TripId": 1001,
+                    "ShareId": "9d9b2fa0-efbf-490e-a5e3-bac8f7d47354",
+                    "Description": "Trip from San Francisco to New York City",
+                    "Name": "Trip in US",
+                    "Budget": 3000,
+                    "StartsAt": "2014-01-01T00:00:00Z",
+                    "EndsAt": "2014-01-04T00:00:00Z",
+                    "Tags": [
+                    "business",
+                    "New York meeting"
+                    ]
+                    }
+                    ]
+                    },
+                    ......
+                    ,
+                    {
+                    "@odata.id": "serviceRoot/People('keithpinckney')",
+                    "@odata.etag": "W/"08D1694D0DBBD9DB"",
+                    "@odata.editLink": "serviceRoot/People('keithpinckney')",
+                    "UserName": "keithpinckney",
+                    "FirstName": "Keith",
+                    "LastName": "Pinckney",
+                    "Emails": [
+                    "Keith@example.com",
+                    "Keith@contoso.com"
+                    ],
+                    "AddressInfo": [],
+                    "Gender": "Male",
+                    "Concurrency": 635404802099763700,
+                    "Trips@odata.context": "serviceRoot/$metadata#People('keithpinckney')/Trips",
+                    "Trips": []
+                    }
+                    ]
+                    }
+                    {% endhighlight %}
+                    </p>
+                </div>
+                </p>
+            </div>
+            <div id="orderby">
+                <h3>System Query Option $orderby</h3>
+                <p>                The <code>$orderby</code> system query option allows clients to request resources in either ascending order using <code>asc</code> or descending order using <code>desc</code>. If <code>asc</code> or <code>desc</code> not specified, then the resources will be ordered in ascending order. The request below orders <em>Trips</em> on property <em>EndsAt</em> in descending order.</p>
+                <p>
+                    <code>GET serviceRoot/People('scottketchum')/Trips?$orderby=EndsAt desc</code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#People('scottketchum')/Trips",
+                "value": [
+                {
+                "TripId": 2004,
+                "ShareId": "f94e9116-8bdd-4dac-ab61-08438d0d9a71",
+                "Description": "Trip from Shanghai to Beijing",
+                "Name": "Trip in Beijing",
+                "Budget": 11000,
+                "StartsAt": "2014-02-01T00:00:00Z",
+                "EndsAt": "2014-02-04T00:00:00Z",
+                "Tags": [
+                "Travel",
+                "Beijing"
+                ]
+                },
+                {
+                "TripId": 2002,
+                "ShareId": "9d9b2fa0-efbf-490e-a5e3-bac8f7d47354",
+                "Description": "Trip from San Francisco to New York City",
+                "Name": "Trip in US",
+                "Budget": 5000,
+                "StartsAt": "2014-01-01T00:00:00Z",
+                "EndsAt": "2014-01-04T00:00:00Z",
+                "Tags": [
+                "business",
+                "New York meeting"
+                ]
+                }
+                ]
+                }
+                {% endhighlight %}
+                </p>
+            </div>
+            <div id="topskip">
+                <h3>System Query Option $top and $skip</h3>
+                <p>
+                    The <code>$top</code> system query option requests the number of items in the queried collection to be included in the result. The $skip query option requests the number of items in the queried collection that are to be skipped and not included in the result.<br />
+                    The request below returns the first two people of the <em>People</em> entity set.
+                </p>
+                <p>
+                    <code>GET serviceRoot/People?$top=2 </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#People",
+                "value": [
+                {
+                "@odata.id": "serviceRoot/People('russellwhyte')",
+                "@odata.etag": "W/"08D1694D4AA4A8D1"",
+                "@odata.editLink": "serviceRoot/People('russellwhyte')",
+                "UserName": "russellwhyte",
+                "FirstName": "Russell",
+                "LastName": "Whyte",
+                "Emails": [
+                "Russell@example.com",
+                "Russell@contoso.com"
+                ],
+                "AddressInfo": [
+                {
+                "Address": "187 Suffolk Ln.",
+                "City": {
+                "CountryRegion": "United States",
+                "Name": "Boise",
+                "Region": "ID"
+                }
+                }
+                ],
+                "Gender": "Male",
+                "Concurrency": 635404803121654000
+                },
+                {
+                "@odata.id": "serviceRoot/People('scottketchum')",
+                "@odata.etag": "W/"08D1694D4AA4A8D1"",
+                "@odata.editLink": "serviceRoot/People('scottketchum')",
+                "UserName": "scottketchum",
+                "FirstName": "Scott",
+                "LastName": "Ketchum",
+                "Emails": [
+                "Scott@example.com"
+                ],
+                "AddressInfo": [
+                {
+                "Address": "2817 Milton Dr.",
+                "City": {
+                "CountryRegion": "United States",
+                "Name": "Albuquerque",
+                "Region": "NM"
+                }
+                }
+                ],
+                "Gender": "Male",
+                "Concurrency": 635404803121654000
+                }
+                ]
+                }
+                {% endhighlight %}
+                <p>                The request below returns people starting with the 19th people of the entity set <em>People</em></p>
+                <p>
+                    <code>GET serviceRoot/People?$skip=18 </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#People",
+                "value": [
+                {
+                "@odata.id": "serviceRoot/People('genevievereeves')",
+                "@odata.etag": "W/"08D1694D8B408D60"",
+                "@odata.editLink": "serviceRoot/People('genevievereeves')",
+                "UserName": "genevievereeves",
+                "FirstName": "Genevieve",
+                "LastName": "Reeves",
+                "Emails": [
+                "Genevieve@example.com",
+                "Genevieve@contoso.com"
+                ],
+                "AddressInfo": [],
+                "Gender": "Female",
+                "Concurrency": 635404804205612400
+                },
+                {
+                "@odata.id": "serviceRoot/People('kristakemp')",
+                "@odata.etag": "W/"08D1694D8B408D60"",
+                "@odata.editLink": "serviceRoot/People('kristakemp')",
+                "UserName": "kristakemp",
+                "FirstName": "Krista",
+                "LastName": "Kemp",
+                "Emails": [
+                "Krista@example.com"
+                ],
+                "AddressInfo": [],
+                "Gender": "Female",
+                "Concurrency": 635404804205612400
+                }
+                ]
+                }
+                {% endhighlight %}
+                </p>
+            </div>
+            <div id="count">
+                <h3>System Query Option $count</h3>
+                <p>
+                    The <code>$count</code> system query option allows clients to request a count of the matching resources included with the resources in the response.<br />
+                    The request below returns the total number of people in the collection.
+                </p>
+                <p>
+                    <code>GET serviceRoot/People?$count=true</code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                20
+                {% endhighlight %}
+                </p>
+            </div>
+            <div id="expand">
+                <h3>System Query Option $expand</h3>
+                <p>                The <code>$expand</code> system query option specifies the related resources to be included in line with retrieved resources. The request below returns people with navigation property <em>Friends</em> of a <em>Person</em></p>
+                <p>
+                    <code>GET serviceRoot/People('keithpinckney')?$expand=Friends </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#People/$entity",
+                "@odata.id": "serviceRoot/People('keithpinckney')",
+                "@odata.etag": "W/"08D1694E2BB4317A"",
+                "@odata.editLink": "serviceRoot/People('keithpinckney')",
+                "UserName": "keithpinckney",
+                "FirstName": "Keith",
+                "LastName": "Pinckney",
+                "Emails": [
+                "Keith@example.com",
+                "Keith@contoso.com"
+                ],
+                "AddressInfo": [],
+                "Gender": "Male",
+                "Concurrency": 635404806897545600,
+                "Friends": [
+                {
+                "@odata.id": "serviceRoot/People('clydeguess')",
+                "@odata.etag": "W/"08D1694E2BB4317A"",
+                "@odata.editLink": "serviceRoot/People('clydeguess')",
+                "UserName": "clydeguess",
+                "FirstName": "Clyde",
+                "LastName": "Guess",
+                "Emails": [
+                "Clyde@example.com"
+                ],
+                "AddressInfo": [],
+                "Gender": "Male",
+                "Concurrency": 635404806897545600
+                },
+                {
+                "@odata.id": "serviceRoot/People('marshallgaray')",
+                "@odata.etag": "W/"08D1694E2BB4317A"",
+                "@odata.editLink": "serviceRoot/People('marshallgaray')",
+                "UserName": "marshallgaray",
+                "FirstName": "Marshall",
+                "LastName": "Garay",
+                "Emails": [
+                "Marshall@example.com",
+                "Marshall@contoso.com"
+                ],
+                "AddressInfo": [],
+                "Gender": "Male",
+                "Concurrency": 635404806897545600
+                }
+                ]
+                }
+                {% endhighlight %}
+                </p>
+            </div>
+            <div id="select">
+                <h3>System Query Option $select</h3>
+                <p>                The <code>$select</code> system query option allows the clients to requests a limited set of properties for each entity <s>or complex type</s>. The request below returns <em>Name</em> and <em>IcaoCode</em> of all <em>Airports</em>.</p>
+                <p>
+                    <code>GET serviceRoot/Airports?$select=Name, IcaoCode</code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#Airports(Name,IcaoCode)",
+                "value": [
+                {
+                "@odata.id": "serviceRoot/Airports('KSFO')",
+                "@odata.editLink": "serviceRoot/Airports('KSFO')",
+                "Name": "San Francisco International Airport",
+                "IcaoCode": "KSFO"
+                },
+                ......
+                ,
+                {
+                "@odata.id": "serviceRoot/Airports('KJFK')",
+                "@odata.editLink": "serviceRoot/Airports('KJFK')",
+                "Name": "John F. Kennedy International Airport",
+                "IcaoCode": "KJFK"
+                }
+                ]
+                }
+                {% endhighlight %}
+                </p>
+            </div>
+            <div id="search">
+                <h3>System Query Option $search</h3>
+                <p>                The $search system query option restricts the result to include only those entities matching the specified search expression. The definition of what it means to match is dependent upon the implementation. The request below get all <em>People</em> who has 'Boise' in their contents.</p>
+                <p>
+                    <code>serviceRoot/People?$search=Boise</code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#People",
+                "value": [
+                {
+                "@odata.id": "serviceRoot/People('russellwhyte')",
+                "@odata.etag": "W/"08D1694E90C0914C"",
+                "@odata.editLink": "serviceRoot/People('russellwhyte')",
+                "UserName": "russellwhyte",
+                "FirstName": "Russell",
+                "LastName": "Whyte",
+                "Emails": [
+                "Russell@example.com",
+                "Russell@contoso.com"
+                ],
+                "AddressInfo": [
+                {
+                "Address": "187 Suffolk Ln.",
+                "City": {
+                "CountryRegion": "United States",
+                "Name": "Boise",
+                "Region": "ID"
+                }
+                }
+                ],
+                "Gender": "Male",
+                "Concurrency": 635404808592855400
+                }
+                ]
+                }
+                {% endhighlight %}
+                </p>
+            </div>
+            <div id="lambda">
+                <h3>Lambda Operators</h3>
+                <p>                OData defines two operators <code>any</code> and <code>all</code> that evaluate a Boolean expression on a collection. They can work on either collection properties or collection of entities.</p>
+                <p>                The request below returns <em>People</em> with <em>Emails</em> containing "ll@contoso.com". The <em>Emails</em> is a collection of primitive type <em>string</em>.</p>
+                <p>
+                    <code>GET serviceRoot/People?$filter=Emails/any(s:endswith(s, 'contoso.com'))</code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#People",
+                "value": [
+                {
+                "@odata.id": "serviceRoot/People('russellwhyte')",
+                "@odata.etag": "W/"08D1694ECB6F8E7D"",
+                "@odata.editLink": "serviceRoot/People('russellwhyte')",
+                "UserName": "russellwhyte",
+                "FirstName": "Russell",
+                "LastName": "Whyte",
+                "Emails": [
+                "Russell@example.com",
+                "Russell@contoso.com"
+                ],
+                "AddressInfo": [
+                {
+                "Address": "187 Suffolk Ln.",
+                "City": {
+                "CountryRegion": "United States",
+                "Name": "Boise",
+                "Region": "ID"
+                }
+                }
+                ],
+                "Gender": "Male",
+                "Concurrency": 635404809577402000
+                },
+                {
+                "@odata.id": "serviceRoot/People('marshallgaray')",
+                "@odata.etag": "W/"08D1694ECB6F8E7D"",
+                "@odata.editLink": "serviceRoot/People('marshallgaray')",
+                "UserName": "marshallgaray",
+                "FirstName": "Marshall",
+                "LastName": "Garay",
+                "Emails": [
+                "Marshall@example.com",
+                "Marshall@contoso.com"
+                ],
+                "AddressInfo": [],
+                "Gender": "Male",
+                "Concurrency": 635404809577402000
+                }
+                ]
+                }
+                {% endhighlight %}
+                <p>                The request below returns the friends of <em>Me</em> who have friends using "Scott" as their <em>FirstName</em>.</p>
+                <p>
+                    <code>GET serviceRoot/Me/Friends?$filter=Friends/any(f:f/FirstName eq 'Scott')</code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                {
+                "@odata.context": "serviceRoot/$metadata#People",
+                "value": [
+                {
+                "@odata.id": "serviceRoot/People('russellwhyte')",
+                "@odata.etag": "W/"08D1694EE92CB5C3"",
+                "@odata.editLink": "serviceRoot/People('russellwhyte')",
+                "UserName": "russellwhyte",
+                "FirstName": "Russell",
+                "LastName": "Whyte",
+                "Emails": [
+                "Russell@example.com",
+                "Russell@contoso.com"
+                ],
+                "AddressInfo": [
+                {
+                "Address": "187 Suffolk Ln.",
+                "City": {
+                "CountryRegion": "United States",
+                "Name": "Boise",
+                "Region": "ID"
+                }
+                }
+                ],
+                "Gender": "Male",
+                "Concurrency": 635404810076337700
+                },
+                {
+                "@odata.id": "serviceRoot/People('ronaldmundy')",
+                "@odata.etag": "W/"08D1694EE92CB5C3"",
+                "@odata.editLink": "serviceRoot/People('ronaldmundy')",
+                "UserName": "ronaldmundy",
+                "FirstName": "Ronald",
+                "LastName": "Mundy",
+                "Emails": [
+                "Ronald@example.com",
+                "Ronald@contoso.com"
+                ],
+                "AddressInfo": [],
+                "Gender": "Male",
+                "Concurrency": 635404810076337700
+                }
+                ]
+                }
+                {% endhighlight %}
+                </p>
+            </div>
+            </p>
+        </div>
+        <div id="modifyData">
+            <h2 class="page-header">Data Modification</h2>
+            <p>            Updatable OData services support Create, Update and Delete operation for some or all exposed entities.</p>
+            <div id="create">
+                <h3>Create an Entity</h3>
+                <p>                To create an entity in a collection, the client sends a POST request to that collection's URL. The POST body MUST contain a single valid entity representation. The request below creates a <em>Person</em> which contains complex type and collection property. </p>
+                <p>
+                    <code>
+                        <br />
+                        POST serviceRoot/People<br />
+                        OData-Version: 4.0<br />
+                        Content-Type: application/json;odata.metadata=minimal<br />
+                        Accept: application/json
+                </p>
+                <p>
+                    {<br />
+                    "@odata.type" : "Microsoft.OData.SampleService.Models.TripPin.Person",<br />
+                    "UserName": "teresa",<br />
+                    "FirstName" : "Teresa",<br />
+                    "LastName" : "Gilbert",<br />
+                    "Gender" : "Female",<br />
+                    "Emails" : ["teresa@example.com", "teresa@contoso.com"],<br />
+                    "AddressInfo" : [<br />
+                    {<br />
+                    "Address" : "1 Suffolk Ln.",<br />
+                    "City" :<br />
+                    {<br />
+                    "CountryRegion" : "United States",<br />
+                    "Name" : "Boise",<br />
+                    "Region" : "ID"<br />
+                    }<br />
+                    }]<br />
+                    }<br />
+                    </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                HTTP/1.1 201 Created
+                Content-Length: 468
+                Content-Type: application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8
+                Location: serviceRoot/People('teresa')
+                OData-Version: 4.0
+                {
+                "@odata.context":"serviceRoot/$metadata#People/$entity",
+                "@odata.id":"serviceRoot/People('teresa')",
+                "@odata.editLink":"serviceRoot/People('teresa')",
+                "UserName":"teresa",
+                "FirstName":"Teresa",
+                "LastName":"Gilbert",
+                "Emails":["teresa@example.com","teresa@contoso.com"],
+                "AddressInfo":[{"Address":"1 Suffolk Ln.","City":{"CountryRegion":"United States","Name":"Boise","Region":"ID"}}],
+                "Gender":"Female"
+                }
+                {% endhighlight %}
+                </p>
+            </div>
+            <div id="delete">
+                <h3>Remove an Entity</h3>
+                <p>
+                    The request below deletes the <em>Person</em> with <em>UserName</em> 'vincentcalabrese'.<br />
+                    <code>DELETE serviceRoot/People('vincentcalabrese') </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                HTTP/1.1 204 No Content
+                OData-Version: 4.0
+                {% endhighlight %}
+                </p>
+            </div>
+            <div id="update">
+                <h3>Update an Entity</h3>
+                <p>                The OData services SHOULD support PATCH as the preferred means of updating an entity. But also services MAY additionally support PUT. The request below update the <em>Emails</em> of a person using PATCH. </p>
+                <p>
+                    <code>
+                        <br />
+                        PATCH serviceRoot/People('russellwhyte')<br />
+                        OData-Version: 4.0<br />
+                        Content-Type: application/json;odata.metadata=minimal<br />
+                        Accept: application/json
+                </p>
+                <p>
+                    {<br />
+                    "@odata.type" : "Microsoft.OData.SampleService.Models.TripPin.Person",<br />
+                    "Emails" :  ["Russell@example.com", "Russell@contoso.com", "newRussell@contoso.com"]<br />
+                    }<br />
+                    </code><br />
+                    <br />
+                    Response Payload
+                </p>
+                {% highlight javascript%}
+                HTTP/1.1 204 No Content
+                {% endhighlight %}
+                </p>
+            </div>
+            <div id="relationship">
+                <h3>Relationship Operations</h3>
+                <p>                Relationships from one entity to another are represented as navigation properties.</p>
+                <div id="linkRelatedEntities">
+                    <h4>Link to Related Entities</h4>
+                    <p>
+                        A successful POST request to a navigation property's references collection adds a relationship to an existing entity. The request below adds 'vincentcalabrese' to friends of 'scottketchum'.<br />
+                        <code>
+                            <br />
+                            POST serviceRoot/People('scottketchum')/Friends/$ref<br />
+                            OData-Version: 4.0<br />
+                            Content-Type: application/json;odata.metadata=minimal<br />
+                            Accept: application/json
+                    </p>
+                    <p>
+                        {<br />
+                        "@odata.id": "serviceRoot/People('vincentcalabrese')"<br />
+                        }<br />
+                        </code><br />
+                        <br />
+                        Response Payload
+                    </p>
+                    {% highlight javascript%}
+                    HTTP/1.1 204 No Content
+                    {% endhighlight %}
+                    </p>
+                </div>
+                <div id="changeLink">
+                    <h4>Change a Link</h4>
+                    <p>
+                        A successful PUT request to a single-valued navigation property’s reference resource changes the related entity. The request below change the <em>Airline</em> of a <em>Flight</em>.<br />
+                        <code>PUT serviceRoot/People('russellwhyte')/Trips(1001)/PlanItems(11)/Microsoft.OData.SampleService.Models.TripPin.Flight/Airline/$ref</code><br />
+                        <code>
+                            <br />
+                            OData-Version: 4.0<br />
+                            Content-Type: application/json;odata.metadata=minimal<br />
+                            Accept: application/json
+                    </p>
+                    <p>
+                        {<br />
+                        "@odata.id": "serviceRoot/Airlines('FM')"<br />
+                        }<br />
+                        </code><br />
+                        <br />
+                        Response Payload
+                    </p>
+                    {% highlight javascript%}
+                    HTTP/1.1 200 OK
+                    {
+                    "@odata.context":"serviceRoot/TripPinServiceRW/$metadata#$ref",
+                    "@odata.id":"serviceRoot/People('russellwhyte')/Trips(1001)/PlanItems(11)/Microsoft.OData.SampleService.Models.TripPin.Flight/Airline"
+                    }
+                    {% endhighlight %}
+                    </p>
+                </div>
+                </p>
+            </div>
+            <div id="operation">
+                <h3>Functions and Actions</h3>
+                <p>                OData supports custom operations (Actions and Functions). Functions are operations exposed by an OData service that MUST return data and MUST have no observable side effects. Actions are operations exposed by an OData service that MAY have side effects when invoked. Functions and actions both MAY bound to an entity type, primitive type, complex type, or a collection.</p>
+                <div id="unboundedFunction">
+                    <h4>Invoking Unbound Functions</h4>
+                    <p>
+                        The function below returns the nearest airport with the input geography point.<br />
+                        <code>GET serviceRoot/GetNearestAirport(lat = 33, lon = -118)</code><br />
+                        <br />
+                        Response Payload
+                    </p>
+                    {% highlight javascript%}
+                    Response 200 OK
+                    {
+                    "@odata.context": "serviceRoot/$metadata#Airports/$entity",
+                    "IcaoCode": "KLAX",
+                    "Name": "Los Angeles International Airport",
+                    "IataCode": "LAX",
+                    "Location": {
+                    "Address": "1 World Way, Los Angeles, CA, 90045",
+                    "City": {
+                    "CountryRegion": "United States",
+                    "Name": "Los Angeles",
+                    "Region": "California"
+                    },
+                    "Loc": {
+                    "type": "Point",
+                    "coordinates": [
+                    -118.408055555556,
+                    33.9425
+                    ],
+                    "crs": {
+                    "type": "name",
+                    "properties": {
+                    "name": "EPSG:4326"
+                    }
+                    }
+                    }
+                    }
+                    }
+                    {% endhighlight %}
+                    </p>
+                </div>
+                <div id="boundedFunction">
+                    <h4>Invoking Bound Functions</h4>
+                    <p>
+                        The request below returns the favorite airline of a person, in TripPin service, "favorite airline" means airline which user choose most times. The function GetFavoriteAirline() is bound to <em>Person</em>.<br />
+                        <code>GET serviceRoot/People('russellwhyte')/Microsoft.OData.SampleService.Models.TripPin.GetFavoriteAirline()</code><br />
+                        <br />
+                        Response Payload
+                    </p>
+                    {% highlight javascript%}
+                    Response 200 OK
+                    {
+                    "@odata.context": "serviceRoot/$metadata#Airlines/$entity",
+                    "@odata.id": "serviceRoot/Airlines('AA')",
+                    "@odata.editLink": "serviceRoot/Airlines('AA')",
+                    "AirlineCode": "AA",
+                    "Name": "American Airlines"
+                    }
+                    {% endhighlight %}
+                    </p>
+                </div>
+                <div id="unboundedAction">
+                    <h4>Invoking Unbound Actions</h4>
+                    <p>
+                        TripPin currently has no scenario supported for unbound actions.
+                    </p>
+                </div>
+                <div id="boundedAction">
+                    <h4>Invoking Bound Actions</h4>
+                    <p>
+                        The action below shares a trip to one of his friend. In TripPin service, by "share a trip" we mean that the owner and his friend now both have the trip and the trip share the same <em>ShareId</em> property.<br />
+                        <code>POST serviceRoot/People('russellwhyte')/Microsoft.OData.SampleService.Models.TripPin.ShareTrip</code><br />
+                        <code>
+                            <br />
+                            OData-Version: 4.0<br />
+                            Content-Type: application/json;odata.metadata=minimal<br />
+                            Accept: application/json
+                    </p>
+                    <p>
+                        {<br />
+                        "userName": "scottketchum",<br />
+                        "tripId": 1001<br />
+                        }<br />
+                        </code><br />
+                        <br />
+                        Response Payload
+                    </p>
+                    {% highlight javascript%}
+                    HTTP/1.1 204 No Content
+                    {% endhighlight %}
+                    </p>
+                </div>
+                </p>
+            </div>
+            <div id="etag">
+                <h3>ETag</h3>
+                <p>                OData V4 supports ETag for Data Modification Request and Action Request. This section demonstrates how to operate on entity with ETag enabled. Please be noted that the ETag value below may be out-of-date, so when you try these requests, please first use the <code>GET</code> request to get the ETag of specified entity.</p>
+                <div id="updateEtag">
+                    <h4>Update Entity with ETag</h4>
+                    <p>
+                        The request below shows how to update <em>Person</em> which has ETag supported. Please be noted that the value for <code>If-Match</code> should be the same with the <code>ETag</code> value of the specified Person.<br />
+                        <code>
+                            <br />
+                            PATCH  serviceRoot/People('clydeguess')<br />
+                            OData-Version: 4.0<br />
+                            Content-Type: application/json;odata.metadata=minimal<br />
+                            Accept: application/json<br />
+                            If-Match: W/"08D15F3DD9126D84"
+                    </p>
+                    <p>
+                        {<br />
+                        "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Person",<br />
+                        "FirstName" : "CLYDE"<br />
+                        }<br />
+                        </code><br />
+                        <br />
+                        Response Payload
+                    </p>
+                    {% highlight javascript%}
+                    HTTP/1.1 204 No Content
+                    {% endhighlight %}
+                    </p>
+                </div>
+                <div id="deleteEtag">
+                    <h4>Delete Entity with ETag</h4>
+                    <p>
+                        The request below shows how to delete <em>Person</em> which has ETag supported. Please be noted that the value for <code>If-Match</code> should be the same with the <code>ETag</code> value of the specified Person.<br />
+                        <code>
+                            <br />
+                            DELETE serviceRoot/People('vincentcalabrese')<br />
+                            OData-Version: 4.0<br />
+                            Content-Type: application/json;odata.metadata=minimal<br />
+                            Accept: application/json<br />
+                            If-Match: W/"08D15F3DD9A61539"<br />
+                        </code><br />
+                        <br />
+                        Response Payload
+                    </p>
+                    {% highlight javascript%}
+                    HTTP/1.1 204 No Content
+                    {% endhighlight %}
+                    </p>
+                </div>
+                </p>
+            </div>
+            </p>
+        </div>
+    </div>
+<div class="col-1-4" style="float:right">
+    <nav class="tutorial-sidebar" aria-label="Page Contents">
+        <ul class="nav tutorial-sidenav" data-spy="affix">
+            <li class="active">
+                <a href="#requestData">Requesting Data</a>
+                <ul class="nav">
+                    <li><a href="#entitySet">Requesting Entity Collections</a></li>
+                    <li><a href="#entityByID">Requesting an Individual Entity by ID</a></li>
+                    <li><a href="#property">Requesting an Individual Property</a></li>
+                    <li><a href="#propertyVal">Requesting an Individual Property Raw Value</a></li>
+                </ul>
+            </li>
+            <li>
+                <a href="#queryData">Querying Data</a>
+                <ul class="nav">
+                    <li><a href="#filter">System Query Option $filter</a></li>
+                    <li><a href="#orderby">System Query Option $orderby</a></li>
+                    <li><a href="#topskip">System Query Option $top and $skip</a></li>
+                    <li><a href="#count">System Query Option $count</a></li>
+                    <li><a href="#expand">System Query Option $expand</a></li>
+                    <li><a href="#select">System Query Option $select</a></li>
+                    <li><a href="#search">System Query Option $search</a></li>
+                    <li><a href="#lambda">Lambda Operators</a></li>
+                </ul>
+            </li>
+            <li>
+                <a href="#modifyData">Data Modification</a>
+                <ul class="nav">
+                    <li><a href="#create">Create an Entity</a></li>
+                    <li><a href="#delete">Delete an Entity</a></li>
+                    <li><a href="#update">Update an Entity</a></li>
+                    <li><a href="#relationship">Relationship Operations</a></li>
+                    <li><a href="#operation">Functions and Actions</a></li>
+                    <li><a href="#etag">ETag</a></li>
+                </ul>
+            </li>
+        </ul>
+    </nav>
+</div>
+<div class="col-1-12"></div>
+</div>
+
+<!--/body-->
+<script type="text/javascript">
+    $(".page-header").css({ "width": "66.66%" });
+    const storeScroll = () => {
+        document.documentElement.dataset.scroll = window.scrollY;
+        var heightScrolled = window.scrollY;
+        var defaultHeight = 100;
+        if (heightScrolled < defaultHeight) {
+            $('#affix-navbar').removeClass("affix-top-30");
+            $('#affix-navbar').addClass("affix-top-50");
+        }
+        else {
+            $('#affix-navbar').removeClass("affix-top-50");
+            $('#affix-navbar').addClass("affix-top-30");
+        }
+    };
+
+    // Listen for new scroll events
+    document.addEventListener("scroll", storeScroll);
+
+    // Update scroll position for first time
+    storeScroll();
+
+</script>
diff --git a/pages/get-started/get-started.html b/pages/get-started/get-started.html
new file mode 100644
index 00000000..1b963ec1
--- /dev/null
+++ b/pages/get-started/get-started.html
@@ -0,0 +1,43 @@
+---
+layout: page
+title: Get Started
+date: 2014-08-08 02:59:36.000000000 +08:00
+permalink: /get-started/
+---
+
+<h2>What is OData?</h2>
+<p>OData (Open Data Protocol) is an <a href="https://www.oasis-open.org/news/pr/iso-iec-jtc-1-approves-oasis-odata-standard-for-open-data-exchange">ISO/IEC approved</a>, <a href="https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=odata">OASIS standard</a> that defines a set of best practices for building and consuming RESTful APIs. OData helps you focus on your business logic while building RESTful APIs without having to worry about the various approaches to define request and response headers, status codes, HTTP methods, URL conventions, media types, payload formats, query options, etc. OData also provides guidance for tracking changes, defining functions/actions for reusable procedures, and sending asynchronous/batch requests.</p>
+<p>OData RESTful APIs are easy to consume. The OData metadata, a machine-readable description of the data model of the APIs, enables the creation of powerful generic client proxies and tools. </p>
+<p>Learn about how to get started with some of our tutorials below!</p>
+
+<h2>Begin Learning</h2>
+<div class="card-column">
+	<div class="card" tabindex="0" onclick="location.href='/getting-started/understand-odata-in-6-steps'">
+		<h3>The Fundamentals: Understand OData in 6 Steps</h3>
+		<p>This overview of OData fundamentals captures the most representative scenarios of OData and REST. It has detailed descriptions of the scenarios and has sample code snippets on different programming platforms to showcase how an OData-based RESTful API can be consumed.</p>
+		<p><strong>Topics:</strong> requesting, querying, and adding data
+	</div>
+	<div class="card" tabindex="0" onclick="location.href='/getting-started/basic-tutorial'">
+		<h3>Tutorial Pt. I: The Basics</h3>
+		<p>This tutorial walks brand-new developers in more detail through the basics of requesting, querying, and modifying resources in an OData service. Since OData defines best practices for REST APIs, this tutorial will feel a lot like documentation you might read for a custom REST API -- but you can apply the principles you learn here to all OData APIs.</p>
+		<p><strong>Topics:</strong> requesting, querying, and modifying data
+	</div>
+	<div class="card" tabindex="0" onclick="location.href='/getting-started/advanced-tutorial'">
+		<h3>Tutorial Pt. II: Advanced Concepts</h3>
+		<p>This tutorial will continue the lesson by introducing more advanced concepts related to working with more complex and specialized types. As with the basic tutorial, all of the principles in the advanced tutorial can be applied to any OData API.</p>
+		<p><strong>Topics:</strong> dynamic types, type inheritance, batch requests
+	</div>
+	<div class="card" tabindex="0" onclick="location.href='/getting-started/understand-odata-in-6-steps'">
+		<h3>Interactive Tutorial via Postman</h3>
+		<p>Do you prefer to learn by doing? This Postman tutorial will walk you through more than 20 real OData requests and responses. The tutorial is designed to use the <a href="/odata-services">TripPin reference service</a>, but again, the principles here can be applied to any OData API.</p>
+		<p><strong>Topics:</strong> requesting, querying, and adding data
+	</div>
+</div>
+
+<h2>Next Steps</h2>
+<ul>
+	<li>Use the <a href="/odata-services">TripPin service</a> from the interactive tutorial to create your own sample service</li>
+	<li>See how other people in our <a href="/ecosystem">ecosystem</a> are using OData and get inspired</li>
+	<li>Explore the <a href="/documentation/">documentation</a> for our msot recent version of OData</li>
+	<li>Contribute to the <a href="https://github.com/OData">OData libraries</a> on GitHub</li>
+</ul>
diff --git a/pages/getting-started/learning-odata-on-postman.html b/pages/get-started/learning-odata-on-postman.html
similarity index 100%
rename from pages/getting-started/learning-odata-on-postman.html
rename to pages/get-started/learning-odata-on-postman.html
diff --git a/pages/getting-started/understand-odata-in-6-steps.html b/pages/get-started/understand-odata-in-6-steps.html
similarity index 100%
rename from pages/getting-started/understand-odata-in-6-steps.html
rename to pages/get-started/understand-odata-in-6-steps.html
diff --git a/pages/getting-started/advanced-tutorial.html b/pages/getting-started/advanced-tutorial.html
deleted file mode 100644
index a72bed3b..00000000
--- a/pages/getting-started/advanced-tutorial.html
+++ /dev/null
@@ -1,751 +0,0 @@
----
-layout: page
-title: Advanced Tutorial
-date: 2014-08-01 03:53:28.000000000 +08:00
-permalink: /getting-started/advanced-tutorial/
----
-<div class="row">
-   <div class="col-2-3">
-      <p>
-         The Open Data Protocol (OData) is a data access protocol built on core protocols like HTTP and commonly accepted methodologies like REST for the web. There are various kinds of <a href="/libraries/">libraries</a> and <a href="/ecosystem/">tools</a> that can be used to consume OData services. But for beginners and those who want to write their own libraries, the pure HTTP requests and responses are also very important. This documentation will not cover every feature details for OData V4 services but will try to cover various typical scenarios. If you want to have a more detailed understanding, please refer to <a href="/documentation/">OData Documentation</a>.
-      </p>
-      <h4>Please note</h4>
-      <ul>
-         <li>This is the advanced section. For topics like requesting data, query options, basic data modification, operations and etc, please refer to <a href="/getting-started/basic-tutorial/">Basic Section</a>.</li>
-         <li>All these are based on OData V4 sample service <a href="https://services.odata.org/V4/TripPinServiceRW">TripPin</a>, please just replace the <code>serviceRoot</code> below with the URL <code>https://services.odata.org/V4/TripPinServiceRW</code>. TripPin now supports ETag, so for data modification topics, you should first using GET on TripPin (eg. GET serviceRoot/People) to get the section information in the payload then use the URL with section for data modification examples. (something looks like https://services.odata.org/V4/(S(flat4rgegiueineatspfdku1))/TripPinServiceRW)</li>
-         <li>You may use <a href="https://www.telerik.com/fiddler">Fiddler</a> to run the request (especially the complex ones of data modification) and get the JSON response.</li>
-         <li>In TripPin service, ETag is currently enabled on entity <em>Person</em>. We omit the ETag related headers in request headers for short, please go to the <a href="/getting-started/basic-tutorial/#etag">ETag Section</a> for detailed information.</li>
-         <li>We will keep improving this by adding contents and fixing bugs. You can provide your feedbacks and ask questions using <a href="/join-the-odata-discussion/">OData Mailling List</a>.</li>
-      </ul>
-      <div id="singleton">
-         <h2 class="page-header">Singleton</h2>
-         <p> Singletons are single entities which are accessed as children of the entity container.</p>
-         <div id="querySingleton">
-            <h3>Requesting singleton</h3>
-            <p> The request below returns the singleton <em>Me</em><br />
-               <code>GET serviceRoot/Me </code><br />
-               <br />
-               Response Payload
-            </p>
-            {% highlight javascript%}
-            {
-            "@odata.context": "serviceRoot/$metadata#Me",
-            "@odata.id": "serviceRoot/Me",
-            "@odata.etag": "W/"08D1694EFF498B20"",
-            "@odata.editLink": "serviceRoot/Me",
-            "UserName": "aprilcline",
-            "FirstName": "April",
-            "LastName": "Cline",
-            "EmailAddress": [
-              "April@example.com",
-              "April@contoso.com"
-            ],
-            "AddressInfo": [
-                {
-                "Address": "P.O. Box 555",
-                "City": 
-                    {
-                        "CountryRegion": "United States",
-                        "Name": "Lander",
-                        "Region": "WY"
-                    }
-                }
-            ],
-            "Gender": "Female",
-            "Concurrency": 635404810447326000
-            }
-            {% endhighlight %}
-         </div>
-         <div id="querySingletonProperty">
-            <h3>Requesting property of Singleton </h3>
-            <p> The request below returns the property <em>AddressInfo</em> of singleton <em>Me</em>.<br />
-               <code>GET serviceRoot/Me/AddressInfo </code><br />
-               <br />
-               Response Payload
-            </p>
-            {% highlight javascript%}
-            {
-                "@odata.context": "serviceRoot/$metadata#Me/AddressInfo",
-                "value":
-                [
-                    {
-                        "Address": "P.O. Box 555",
-                        "City":
-                        {
-                            "CountryRegion": "United States",
-                            "Name": "Lander",
-                            "Region": "WY"
-                        }
-                    }
-                ]
-            }
-            {% endhighlight %}
-            <p>
-            </p>
-         </div>
-         <div id="updateSingleton">
-            <h3>Update Singleton</h3>
-            <p> The request below updates the <em>UserName</em> of Single <em>Me</em>.<br />
-               <code><br />
-               PATCH serviceRoot/Me<br />
-               OData-Version: 4.0<br />
-               Content-Type: application/json;odata.metadata=minimal<br />
-               Accept: application/json<br />
-               {<br />
-                 "@odata.type" : "Microsoft.OData.SampleService.Models.TripPin.Person",<br />
-                 "UserName": "AprilTripPin"<br />
-               }<br />
-               </code><br />
-               <br />
-               Response Payload
-            </p>
-            {% highlight javascript%}
-            HTTP/1.1 204 No Content
-            OData-Version: 4.0
-            {% endhighlight %}
-         </div>
-      </div>
-      <div id="derived">
-         <h2 class="page-header">Derived Entity Type</h2>
-         <p> OData now supports derived entity type. Entity types may derived by single inheritance from other entity types. In the sample TripPin service, the entity type <em>Event</em> and <em>Flight</em> both derive from entity type <em>PlanItem</em>.</p>
-         <div id="requestDerived">
-            <h3>Requesting a Derived Entity</h3>
-            <p> The request below returns the flight of with <em>PlanItemId</em> 21.</p>
-            <p> <code>GET serviceRoot/People('russellwhyte')/Trips(1003)/PlanItems(21)/Microsoft.OData.SampleService.Models.TripPin.Flight</code><br />
-               <br /> <br />
-               Response Payload
-            </p>
-            {% highlight javascript%}
-            {
-            "@odata.context": "serviceRoot/$metadata#People('russellwhyte')/Trips(1003)/PlanItems/Microsoft.OData.SampleService.Models.TripPin.Flight/$entity",
-            "PlanItemId": 21,
-            "ConfirmationCode": "JH58494",
-            "StartsAt": "2014-02-01T08:00:00+08:00",
-            "EndsAt": "2014-02-01T09:20:00+08:00",
-            "Duration": "PT0S",
-            "SeatNumber": "B11",
-            "FlightNumber": "FM1930"
-            }
-            {% endhighlight %}
-         </div>
-         <div id="requestDerivedEntitySet">
-            <h3>Requesting a Derived Entity Collection</h3>
-            <p> The request below shows how to get the derived enity set <em>Flights</em>.<br />
-               <code>GET serviceRoot/People('russellwhyte')/Trips(1001)/PlanItems/Microsoft.OData.SampleService.Models.TripPin.Flight</code><br />
-               <br />
-               Response Payload
-            </p>
-            {% highlight javascript%}
-            {
-            "@odata.context": "serviceRoot/$metadata#People('russellwhyte')/Trips(1001)/PlanItems/Microsoft.OData.SampleService.Models.TripPin.Flight",
-            "value": [
-            {
-            "PlanItemId": 11,
-            "ConfirmationCode": "JH58493",
-            "StartsAt": "2014-01-01T08:00:00+08:00",
-            "EndsAt": "2014-01-01T09:20:00+08:00",
-            "Duration": "PT0S",
-            "SeatNumber": null,
-            "FlightNumber": "VA1930"
-            },
-            {
-            "PlanItemId": 13,
-            "ConfirmationCode": "JH58493",
-            "StartsAt": "2014-01-04T13:00:00+08:00",
-            "EndsAt": "2014-01-04T14:20:00+08:00",
-            "Duration": "PT0S",
-            "SeatNumber": null,
-            "FlightNumber": "VA1930"
-            }
-            ]
-            }
-            {% endhighlight %}
-         </div>
-         <div id="filterDerived">
-            <h3>Filter on Derived Type</h3>
-            <p> The two request below shows how to filter on derived entities. These requests return all <em>Flight</em> deriving from <em>PlanItem</em> which has <em>FlightNumber</em> as 'VA1930'.</p>
-            <p> <code>serviceRoot/People('russellwhyte')/Trips(1001)/PlanItems?$filter=Microsoft.OData.SampleService.Models.TripPin.Flight/FlightNumber eq 'VA1930'</code><br />
-               <code>serviceRoot/People('russellwhyte')/Trips(1001)/PlanItems/Microsoft.OData.SampleService.Models.TripPin.Flight?$filter=FlightNumber eq 'VA1930'</code><br />
-               <br />
-               Response Payload
-            </p>
-            {% highlight javascript%}
-            {
-            "@odata.context": "serviceRoot/$metadata#People('russellwhyte')/Trips(1001)/PlanItems/Microsoft.OData.SampleService.Models.TripPin.Flight",
-            "value": [
-            {
-            "PlanItemId": 11,
-            "ConfirmationCode": "JH58493",
-            "StartsAt": "2014-01-01T08:00:00+08:00",
-            "EndsAt": "2014-01-01T09:20:00+08:00",
-            "Duration": "PT0S",
-            "SeatNumber": null,
-            "FlightNumber": "VA1930"
-            },
-            {
-            "PlanItemId": 13,
-            "ConfirmationCode": "JH58493",
-            "StartsAt": "2014-01-04T13:00:00+08:00",
-            "EndsAt": "2014-01-04T14:20:00+08:00",
-            "Duration": "PT0S",
-            "SeatNumber": null,
-            "FlightNumber": "VA1930"
-            }
-            ]
-            }
-            {% endhighlight %}
-         </div>
-         <div id="createDerived">
-            <h3>Create a Derived Entity</h3>
-            <p> The request below creates an event entity in trips. <em>Event</em> derives from <em>PlanItem</em>.<br />
-               <code><br />
-               POST serviceRoot/People("russellwhyte")/Trips(1003)/PlanItems<br />
-               OData-Version: 4.0<br />
-               Content-Type: application/json
-               ;
-               odata.metadata=minimal<br />
-               Accept: application/json
-               {<br />
-               "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Event",<br />
-               "ConfirmationCode": "4372899DD",<br />
-               "Description": "Client Meeting",<br />
-               "Duration": "PT3H",<br />
-               "EndsAt": "2014-06-01T23:11:17.5479185-07:00",<br />
-               "OccursAt": {<br />
-               "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.EventLocation",<br />
-               "Address": "100 Church Street, 8th Floor, Manhattan, 10007",<br />
-               "BuildingInfo": "Regus Business Center",<br />
-               "City": {<br />
-               "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.City",<br />
-               "CountryRegion": "United States",<br />
-               "Name": "New York City",<br />
-               "Region": "New York"<br />
-               }<br />
-               },<br />
-               "PlanItemId": 33,<br />
-               "StartsAt": "2014-05-25T23:11:17.5459178-07:00"<br />
-               }<br />
-               </code><br />
-               <br />
-               Response Payload
-            </p>
-            {% highlight javascript%}
-            Response HTTP/1.1 201 Created
-            {
-            "@odata.context": "serviceRoot/$metadata#People('russellwhyte')/Trips(1003)/PlanItems/$entity",
-            "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Event",
-            "PlanItemId": 33,
-            "ConfirmationCode": "4372899DD",
-            "StartsAt": "2014-05-25T23:11:17.5459178-07:00",
-            "EndsAt": "2014-06-01T23:11:17.5479185-07:00",
-            "Duration": "PT3H",
-            "Description": "Client Meeting",
-            "OccursAt": {
-            "Address": "100 Church Street, 8th Floor, Manhattan, 10007",
-            "City": {
-            "CountryRegion": "United States",
-            "Name": "New York City",
-            "Region": "New York"
-            },
-            "BuildingInfo": "Regus Business Center"
-            }
-            }
-            {% endhighlight %}
-         </div>
-         <div id="updateDerived">
-            <h3>Update a Derived Entity</h3>
-            <p> The request below updates an event. <em>Event</em> derives from <em>PlanItem</em>.<br />
-               <code><br />
-               PATCH serviceRoot/People('russellwhyte')/Trips(1003)/PlanItems(5)/Microsoft.OData.SampleService.Models.TripPin.Event<br />
-               OData-Version: 4.0<br />
-               Content-Type: application/json;odata.metadata=minimal<br />
-               Accept: application/json
-               {<br />
-               "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Event",<br />
-               "Description": "This is a new description"<br />
-               }<br />
-               </code><br />
-               <br />
-               Response Payload
-            </p>
-            {% highlight javascript%}
-            HTTP/1.1 204 No Content
-            {% endhighlight %}
-         </div>
-         <div id="deleteDerived">
-            <h3>Delete a Derived Entity</h3>
-            <p> The request below deletes the flight plan item with Id '21' from a trip of person. <em>Flight</em> derives from <em>PlanItem</em>.</p>
-            <p> <code>DELETE serviceRoot/People('russellwhyte')/Trips(1003)/PlanItems(21)/Microsoft.OData.SampleService.Models.TripPin.Flight</code><br />
-               <br />
-               Response Payload
-            </p>
-            {% highlight javascript%}
-            HTTP/1.1 204 No Content
-            {% endhighlight %}
-         </div>
-      </div>
-      <div id="containment">
-         <h2 class="page-header">Containment Navigation Property</h2>
-         <p> Containment navigation properties define an implicit entity set for each instance of its declaring entity type. This implicit entity set if identified by the read URL of the navigation property for that entity. The request below returns the contained navigation property <em>Trips</em> of entity set <em>People</em>.</p>
-         <div id="queryContianed">
-            <h3>Requesting a Contained Entity Set</h3>
-            <p> The request below returns <em>Trips</em> for a person where <em>Trips</em> is a containment navigation property for <em>Person</em>.<br />
-               <code>GET serviceRoot/People('russellwhyte')/Trips </code><br />
-               <br />
-               Response Payload
-            </p>
-            {% highlight javascript%}
-            {
-            "@odata.context": "https://services.odata.org/V4/(S(mmobft3g4aut3krzqrxxip4w))/TripPinServiceRW/$metadata#People('russellwhyte')/Trips",
-            "value": [
-            {
-            "TripId": 1001,
-            "ShareId": "9d9b2fa0-efbf-490e-a5e3-bac8f7d47354",
-            "Description": "Trip from San Francisco to New York City",
-            "Name": "Trip in US",
-            "Budget": 3000,
-            "StartsAt": "2014-01-01T00:00:00Z",
-            "EndsAt": "2014-01-04T00:00:00Z",
-            "Tags": [
-            "business",
-            "New York meeting"
-            ]
-            },
-            ......
-            ,
-            {
-            "TripId": 1007,
-            "ShareId": "9ce142c3-5fd6-4a71-848e-5220ebf1e9f3",
-            "Description": "Happy honeymoon trip",
-            "Name": "Honeymoon",
-            "Budget": 2650,
-            "StartsAt": "2014-02-01T00:00:00Z",
-            "EndsAt": "2014-02-04T00:00:00Z",
-            "Tags": [
-            "Travel",
-            "honeymoon"
-            ]
-            }
-            ]
-            }
-            {% endhighlight %}
-         </div>
-         <div id="createContain">
-            <h3>Create a Contained Entity</h3>
-            <p> The request below creates a <em>Trip</em> for <em>Person</em> with <em>UserName</em> 'russellwhyte'. <em>Trips</em> is a contained navigation property for <em>Person</em>.<br />
-               <code><br />
-               POST serviceRoot/People('russellwhyte')/Trips<br />
-               OData-Version: 4.0<br />
-               Content-Type: application/json;odata.metadata=minimal<br />
-               Accept: application/json<br />
-               {<br />
-               "@odata.type" : "Microsoft.OData.SampleService.Models.TripPin.Trip",<br />
-               "TripId" : 3,<br />
-               "ShareId" : null,<br />
-               "Description" : "Create Containment",<br />
-               "Name" : "Test Trip",<br />
-               "StartsAt" : "2014-01-01T00:00:00+08:00",<br />
-               "EndsAt" : "2014-02-01T00:00:00+08:00",<br />
-               "Budget" : 1000,<br />
-               "Tags" : [<br />
-               "Test Tag 1",<br />
-               "Test Tag 2"<br />
-               ]<br />
-               }<br />
-               </code><br />
-               <br />
-               Response Payload
-            </p>
-            {% highlight javascript%}
-            HTTP/1.1 201 Created
-            Content-Length: 344
-            Content-Type: application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8
-            Location: serviceRoot/People('russellwhyte')/Trips(3)
-            OData-Version: 4.0
-            {
-            "@odata.context":"serviceRoot/$metadata#People('russellwhyte')/Trips/$entity",
-            "TripId":3,
-            "ShareId":"00000000-0000-0000-0000-000000000000",
-            "Description":"Create Containment",
-            "Name":"Test Trip",
-            "Budget":1000,
-            "StartsAt":"2014-01-01T00:00:00+08:00",
-            "EndsAt":"2014-02-01T00:00:00+08:00",
-            "Tags":["Test Tag 1","Test Tag 2"]
-            }
-            {% endhighlight %}
-         </div>
-         <div id="filterContain">
-            <h3>Filter on a Contained Entity Set</h3>
-            <p> The request below returns <em>Trips</em> that contains 'New York' in its description of <em>Person</em> with <em>UserName</em> 'russellwhyte'.<br />
-               <code>GET serviceRoot/People('russellwhyte')/Trips?$filter=contains(Description, 'New York')</code><br />
-               <br />
-               Response Payload
-            </p>
-            {% highlight javascript%}
-            {
-            "@odata.context": "serviceRoot/$metadata#People('russellwhyte')/Trips",
-            "value": [
-            {
-            "TripId": 1001,
-            "ShareId": "9d9b2fa0-efbf-490e-a5e3-bac8f7d47354",
-            "Description": "Trip from San Francisco to New York City",
-            "Name": "Trip in US",
-            "Budget": 3000,
-            "StartsAt": "2014-01-01T00:00:00+08:00",
-            "EndsAt": "2014-01-04T00:00:00+08:00",
-            "Tags": [
-            "business",
-            "New York meeting"
-            ]
-            }
-            ]
-            }
-            {% endhighlight %}
-         </div>
-         <div id="updateContainment">
-            <h3>Update Contained Entity</h3>
-            <p> The request below updates the contained Entity <em>Trip</em>.<br />
-               <code><br />
-               PATCH serviceRoot/People('russellwhyte')/Trips(1001)<br />
-               OData-Version: 4.0<br />
-               Content-Type: application/json;odata.metadata=minimal<br />
-               Accept: application/json
-               {<br />
-               "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Trip",<br />
-               "Description": "This is a new description"<br />
-               }<br />
-               </code>
-            </p>
-            <p> Response Payload</p>
-            {% highlight javascript%}
-            HTTP/1.1 204 No Content
-            {% endhighlight %}
-         </div>
-         <div id="deleteContaiment">
-            <h3>Delete Contained Entity</h3>
-            <p> The request below deletes a contained Entity <em>Trip</em>. </p>
-            <p> <code>DELETE serviceRoot/People('russellwhyte')/Trips(1001)</code><br />
-               <br />
-               Response Payload
-            </p>
-            {% highlight javascript%}
-            HTTP/1.1 204 No Content
-            {% endhighlight %}
-         </div>
-      </div>
-      <div id="openType">
-         <h2 class="page-header">Open Type</h2>
-         <p> OData V4 supports entity or complex types which allow clients to persist additional undeclared properties. Such entities and complex types are called open types.</p>
-         <div id="openEntity">
-            <h3>Open Entity Type</h3>
-            <p> When create or update an open entity, undeclared properties can be added.<br />
-               The request below shows how to add an undeclared property <em>Description</em> when create the open entity <em>Person</em>.<br />
-               <code><br />
-               POST serviceRoot/People<br />
-               OData-Version: 4.0<br />
-               Content-Type: application/json;odata.metadata=minimal<br />
-               Accept: application/json<br />
-               ETag: W/"08D15F3DD9126D84"
-               {<br />
-               "@odata.type" : "Microsoft.OData.SampleService.Models.TripPin.Person",<br />
-               "UserName": "teresa",<br />
-               "FirstName" : "Teresa",<br />
-               "LastName" : "Gilbert",<br />
-               "Gender" : "Female",<br />
-               "Description": "Big fan for travelling",<br />
-               "Emails" : ["teresa@example.com", "teresa@contoso.com"],<br />
-               "AddressInfo" : [<br />
-               {<br />
-               "Address" : "1 Suffolk Ln.",<br />
-               "City" :<br />
-               {<br />
-               "CountryRegion" : "United States",<br />
-               "Name" : "Boise",<br />
-               "Region" : "ID"<br />
-               }<br />
-               }]<br />
-               }<br />
-               </code><br />
-               <br />
-               Response Payload
-            </p>
-            {% highlight javascript%}
-            HTTP/1.1 201 Created
-            {
-            "@odata.context":"serviceRoot/$metadata#People/$entity",
-            "@odata.id":"serviceRoot/People('teresa')",
-            "@odata.editLink":"serviceRoot/People('teresa')",
-            "UserName":"teresa",
-            "FirstName":"Teresa",
-            "LastName":"Gilbert",
-            "Description": "Big fan for travelling",
-            "Emails":["teresa@example.com","teresa@contoso.com"],
-            "AddressInfo":[{"Address":"1 Suffolk Ln.","City":{"CountryRegion":"United States","Name":"Boise","Region":"ID"}}],
-            "Gender":"Female"
-            }
-            {% endhighlight %}
-            <p>
-               The request below shows how to add an undeclared property <em>Description</em> when update the open entity <em>Person</em>.<br />
-               <code><br />
-               PATCH serviceRoot/People('keithpinckney')<br />
-               OData-Version: 4.0<br />
-               Content-Type: application/json;odata.metadata=minimal<br />
-               Accept: application/json
-               {<br />
-               "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Person",<br />
-               "Description": "Big fan for travelling"<br />
-               }<br />
-               <br />
-               Response Payload<br />
-               </code>
-               {% highlight javascript%}
-               HTTP/1.1 204 No Content
-               {% endhighlight %}
-            </p>
-         </div>
-         <div id="openComplex">
-            <h3>Open Complex Type</h3>
-            <p> OData V4 also supports open type for complex types.<br />
-               The request below show how to add undeclared property <em>Description</em> when create new instance with <em>AddressInfo</em> of open complex type <em>Location</em>. 
-            </p>
-            <p> <code><br />
-               PATCH serviceRoot/People('russellwhyte')<br />
-               OData-Version: 4.0<br />
-               Content-Type: application/json;odata.metadata=minimal<br />
-               Accept: application/json
-               {<br />
-               "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Person",<br />
-               "AddressInfo@odata.type": "#Collection(Microsoft.OData.SampleService.Models.TripPin.Location)",<br />
-               "AddressInfo": [<br />
-               {<br />
-               "Address": "187 Suffolk Ln.",<br />
-               "City": {<br />
-               "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.City",<br />
-               "CountryRegion": "United States",<br />
-               "Name": "Boise",<br />
-               "Region": "ID"<br />
-               },<br />
-               "Description": null<br />
-               },<br />
-               {<br />
-               "Address": "XuanWu Load 555",<br />
-               "City": {<br />
-               "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.City",<br />
-               "CountryRegion": "China",<br />
-               "Name": "NanJing",<br />
-               "Region": "JiangSu"<br />
-               },<br />
-               "Description": "Nice Location"<br />
-               }<br />
-               ],<br />
-               "Concurrency": 635393824693486800,<br />
-               "Description": null,<br />
-               "Emails@odata.type": "#Collection(String)",<br />
-               "Emails": [<br />
-               "Russell@example.com",<br />
-               "Russell@contoso.com"<br />
-               ],<br />
-               "FirstName": "Russell",<br />
-               "Gender@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.PersonGender",<br />
-               "Gender": "Male",<br />
-               "LastName": "Whyte",<br />
-               "UserName": "russellwhyte"<br />
-               }<br />
-               </code><br />
-               <br />
-               Response Payload
-            </p>
-            {% highlight javascript%}
-            HTTP/1.1 204 No Content
-            {% endhighlight %}
-            <p>
-               The request below show how to add undeclared property <em>Description</em> when update an instance with <em>OccursAt</em> of open complex type <em>EventLocation</em>. 
-            </p>
-            <p> <code>PATCH serviceRoot/People('russellwhyte')/Trips(1003)/PlanItems(5)/Microsoft.OData.SampleService.Models.TripPin.Event</code><br />
-               <code><br />
-               OData-Version: 4.0<br />
-               Content-Type: application/json;odata.metadata=minimal<br />
-               Accept: application/json
-               {<br />
-               "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Event",<br />
-               "OccursAt": {<br />
-               "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.EventLocation",<br />
-               "Address": "10 Beijing Street, 100000",<br />
-               "BuildingInfo": "Beijing Restaurant",<br />
-               "City": {<br />
-               "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.City",<br />
-               "CountryRegion": "China",<br />
-               "Name": "Beijing",<br />
-               "Region": "Beijing"<br />
-               },<br />
-               "Description": "Beautiful City."<br />
-               }<br />
-               }<br />
-               </code><br />
-               <br />
-               Response Payload
-            </p>
-            {% highlight javascript%}
-            HTTP/1.1 204 No Content
-            {% endhighlight %}
-         </div>
-      </div>
-      <div id="batch">
-         <h2 class="page-header">Batch</h2>
-         <p> Batch requests allow grouping multiple operations into a single HTTP request payload. The Batch request below contains the following operations in order listed:<br />
-            &nbsp;&nbsp;&nbsp;&nbsp;1. A query request, returns all <em>Airlines</em>.<br />
-            &nbsp;&nbsp;&nbsp;&nbsp;2. Create an entity, a new <em>Airline</em>.<br />
-            &nbsp;&nbsp;&nbsp;&nbsp;3. A second query request <em>Airlines</em>.
-         </p>
-         <p> <code><br />
-            POST serviceRoot/$batch<br />
-            OData-Version: 4.0<br />
-            Content-Type: multipart/mixed;boundary=batch_36522ad7-fc75-4b56-8c71-56071383e77b<br />
-            </code>
-         </p>
-         <p> <code><br />
-            --batch_36522ad7-fc75-4b56-8c71-56071383e77b<br />
-            Content-Type: application/http<br />
-            Content-Transfer-Encoding:binary
-            GET serviceRoot/Airlines HTTP/1.1<br />
-            Accept: application/json;odata.metadata=minimal
-            --batch_36522ad7-fc75-4b56-8c71-56071383e77b<br />
-            Content-Type: application/http<br />
-            Content-Transfer-Encoding:binary<br />
-            Content-ID: 1
-            POST serviceRoot/Airlines HTTP/1.1<br />
-            OData-Version: 4.0<br />
-            Content-Type: application/json;odata.metadata=minimal<br />
-            Accept: application/json;odata.metadata=minimal
-            {<br />
-            "@odata.type" : "Microsoft.OData.SampleService.Models.TripPin.Airline",<br />
-            "AirlineCode" : "EK",<br />
-            "Name" : "Emirates Airline"<br />
-            }
-            --batch_36522ad7-fc75-4b56-8c71-56071383e77b<br />
-            Content-Type: application/http<br />
-            Content-Transfer-Encoding:binary
-            GET serviceRoot/Airlines HTTP/1.1<br />
-            Accept: application/json;odata.metadata=minimal
-            --batch_36522ad7-fc75-4b56-8c71-56071383e77b--
-            </code><br />
-            <br />
-            Response Payload
-            {% highlight javascript%}
-            HTTP/1.1 200 OK
-            Cache-Control: no-cache
-            Content-Length: 3100
-            Content-Type: multipart/mixed; boundary=batchresponse_3e4cf86f-ab02-46e1-9631-b08a787abc35
-            OData-Version: 4.0
-            --batchresponse_3e4cf86f-ab02-46e1-9631-b08a787abc35
-            Content-Type: application/http
-            Content-Transfer-Encoding: binary
-            HTTP/1.1 200 OK
-            OData-Version: 4.0
-            Content-Type: application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8
-            {
-            "@odata.context":"serviceRoot/$metadata#Airlines",
-            "value":
-            [{
-            "AirlineCode":"AA",
-            "Name":"American Airlines"
-            },
-            {
-            "AirlineCode":"FM",
-            "Name":"Shanghai Airline"
-            },
-            {
-            "AirlineCode":"MU",
-            "Name":"China Eastern Airlines"
-            }
-            ]}
-            --batchresponse_3e4cf86f-ab02-46e1-9631-b08a787abc35
-            Content-Type: application/http
-            Content-Transfer-Encoding: binary
-            HTTP/1.1 201 Created
-            Location: serviceRoot/Airlines('EK')
-            OData-Version: 4.0
-            Content-Type: application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8
-            {
-            "@odata.context":"serviceRoot/$metadata#Airlines/$entity",
-            "@odata.id":"serviceRoot/Airlines('EK')",
-            "@odata.editLink":"serviceRoot/Airlines('EK')",
-            "AirlineCode":"EK","Name":"Emirates Airline"
-            }
-            --batchresponse_3e4cf86f-ab02-46e1-9631-b08a787abc35
-            Content-Type: application/http
-            Content-Transfer-Encoding: binary
-            HTTP/1.1 200 OK
-            OData-Version: 4.0
-            Content-Type: application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8
-            {
-            "@odata.context":"serviceRoot/$metadata#Airlines",
-            "value":
-            [{
-            "AirlineCode":"AA",
-            "Name":"American Airlines"},
-            {
-            "AirlineCode":"FM",
-            "Name":"Shanghai Airline"
-            },
-            {
-            "AirlineCode":"MU",
-            "Name":"China Eastern Airlines"
-            },
-            {
-            "AirlineCode":"EK",
-            "Name":"Emirates Airline"
-            }]
-            }
-            --batchresponse_3e4cf86f-ab02-46e1-9631-b08a787abc35--
-            {% endhighlight %}
-      </div>
-   </div>
-   <div class="col-1-4" style="float:right">
-      <nav class="tutorial-sidebar" aria-label="Page Contents">
-         <ul class="nav tutorial-sidenav" data-spy="affix">
-            <li class="active">
-               <a href="#singleton">Singleton</a>
-               <ul class="nav">
-                  <li><a href="#querySingleton">Requesting Singleton</a></li>
-                  <li><a href="#querySingletonProperty">Requesting Property of Singleton Property</a></li>
-                  <li><a href="#updateSingleton">Update Singleton</a></li>
-               </ul>
-            </li>
-            <li>
-               <a href="#derived">Derived Entity Type</a>
-               <ul class="nav">
-                  <li><a href="#requestDerivedEntitySet">Requesting a Derived Entity Collection</a></li>
-                  <li><a href="#requestDerived">Requesting a Derived Entity</a></li>
-                  <li><a href="#filterDerived">Querying on Derived Entities</a></li>
-                  <li><a href="#createDerived">Create a Derived Entity</a></li>
-                  <li><a href="#updateDerived">Update a Derived Entity</a></li>
-                  <li><a href="#deleteDerived">Delete a Derived Entity</a></li>
-               </ul>
-            </li>
-            <li>
-               <a href="#containment">Containment Navigation Property</a>
-               <ul class="nav">
-                  <li><a href="#queryContained">Requesting a Contained Entity Set</a></li>
-                  <li><a href="#createContain">Create a Contained Entity</a></li>
-                  <li><a href="#filterContain">Filter on a Contained Entity Set</a></li>
-                  <li><a href="#updateContainment">Update a Contained Entity</a></li>
-                  <li><a href="#deleteContainment">Delete a Contained Entity</a></li>
-               </ul>
-            </li>
-            <li>
-               <a href="#openType">Open Type</a>
-               <ul class="nav">
-                  <li><a href="#openEntity">Open Entity Type</a></li>
-                  <li><a href="#openComplex">Open Complex Type</a></li>
-               </ul>
-            </li>
-            <li>
-               <a href="#batch">Batch</a>
-            </li>
-         </ul>
-      </nav>
-   </div>
-   <div class="col-1-12"></div>
-</div>
\ No newline at end of file
diff --git a/pages/getting-started/basic-tutorial.html b/pages/getting-started/basic-tutorial.html
deleted file mode 100644
index 6eb54406..00000000
--- a/pages/getting-started/basic-tutorial.html
+++ /dev/null
@@ -1,1048 +0,0 @@
----
-layout: page
-title: Basic Tutorial
-date: 2014-08-01 03:44:56.000000000 +08:00
-permalink: /getting-started/basic-tutorial/
----
-<!--body data-spy="scroll" data-target="nav"-->
-<div class="row">
-<div class="col-2-3">
-<p>            The Open Data Protocol (OData) is a data access protocol built on core protocols like HTTP and commonly accepted methodologies like REST for the web. There are various kinds of <a href="/libraries/">libraries</a> and <a href="/ecosystem/">tools</a>  can be used to consume OData services. But for beginners and those who want to write their own libraries, the pure HTTP requests and responses are also very important. This documentation will not cover every feature details for OData V4 services but will try to cover various typical scenarios.  If you want to have a more detailed understanding, please refer to <a href="/documentation/">OData Documentation</a>. </p>
-<p>        You can now use the <b><a href="/getting-started/learning-odata-on-postman">Postman collections</a></b> to learn OData in an interactive way.</p>
-<h4>Please note:</h4>
-<ul>
-<li>This is the Basic section. For topics like Singleton, Inheritance, Open Type, Containment and Batch, please refer to <a href="/getting-started/advanced-tutorial/">Advanced Section</a>.</li>
-<li>All these are based on OData V4 sample service <a href="https://services.odata.org/V4/TripPinServiceRW">TripPin</a>, please just replace the <code>serviceRoot</code> below with the URL <code>https://services.odata.org/V4/TripPinServiceRW</code>. TripPin now supports ETag, so for data modification topics, you should first using GET on TripPin (eg. GET serviceRoot/People) to get the section information in the payload then use the URL with section for data modification examples. (something looks like <code>https://services.odata.org/V4/(S(flat4rgegiueineatspfdku1))/TripPinServiceRW)</code></li>
-<li>You may use <a href="https://www.telerik.com/fiddler">Fiddler</a> to run the request (especially the complex ones of data modification) and get the JSON response.</li>
-<li>In TripPin service, ETag is currently enabled on entity <em>Person</em>. We omit the ETag related headers in request headers for short, please go to the <a href="/getting-started/basic-tutorial/#etag">ETag Section</a> for detailed information.</li>
-<li>We will keep improving this by adding contents and fixing bugs. You can provide your feedbacks and ask questions using <a href="/join-the-odata-discussion/">OData Mailling List</a>.</li>
-</ul>
-<div id="requestData">
-<h2 class="page-header">Requesting Data</h2>
-<p>            OData services support requests for data via HTTP <code>GET</code> requests.</p>
-<div id="entitySet">
-<h3>Requesting Entity Collections</h3>
-<p>                The request below returns the the collection of Person <em>People</em>.<br />
-                <code>GET serviceRoot/People </code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-{
-    "@odata.context": "serviceRoot/$metadata#People",
-    "@odata.nextLink": "serviceRoot/People?%24skiptoken=8",
-    "value": [
-        {
-            "@odata.id": "serviceRoot/People('russellwhyte')",
-            "@odata.etag": "W/"08D1694BD49A0F11"",
-            "@odata.editLink": "serviceRoot/People('russellwhyte')",
-            "UserName": "russellwhyte",
-            "FirstName": "Russell",
-            "LastName": "Whyte",
-            "Emails": [
-                "Russell@example.com",
-                "Russell@contoso.com"
-            ],
-            "AddressInfo": [
-                {
-                    "Address": "187 Suffolk Ln.",
-                    "City": {
-                        "CountryRegion": "United States",
-                        "Name": "Boise",
-                        "Region": "ID"
-                    }
-                }
-            ],
-            "Gender": "Male",
-            "Concurrency": 635404796846280400
-        },
-        ......
-        ,
-        {
-            "@odata.id": "serviceRoot/People('keithpinckney')",
-            "@odata.etag": "W/"08D1694BD49A0F11"",
-            "@odata.editLink": "serviceRoot/People('keithpinckney')",
-            "UserName": "keithpinckney",
-            "FirstName": "Keith",
-            "LastName": "Pinckney",
-            "Emails": [
-                "Keith@example.com",
-                "Keith@contoso.com"
-            ],
-            "AddressInfo": [],
-            "Gender": "Male",
-            "Concurrency": 635404796846280400
-        }
-    ]
-}
-                    {% endhighlight %}
-</p></div>
-<div id="entityByID">
-<h3>Requesting an Individual Entity by ID</h3>
-<p>                The request below returns an individual entity of type <em>Person</em> by the given UserName "russellwhyte"<br />
-                <code>GET serviceRoot/People('russellwhyte') </code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-{
-    "@odata.context": "serviceRoot/$metadata#People/$entity",
-    "@odata.id": "serviceRoot/People('russellwhyte')",
-    "@odata.etag": "W/"08D1694BF26D2BC9"",
-    "@odata.editLink": "serviceRoot/People('russellwhyte')",
-    "UserName": "russellwhyte",
-    "FirstName": "Russell",
-    "LastName": "Whyte",
-    "Emails": [
-        "Russell@example.com",
-        "Russell@contoso.com"
-    ],
-    "AddressInfo": [
-        {
-            "Address": "187 Suffolk Ln.",
-            "City": {
-                "CountryRegion": "United States",
-                "Name": "Boise",
-                "Region": "ID"
-            }
-        }
-    ],
-    "Gender": "Male",
-    "Concurrency": 635404797346655200
-}
-            {% endhighlight %}
-</p></div>
-<div id="property">
-<h3>Requesting an Individual Property</h3>
-<p>                To address an entity property clients append a path segment containing property name to the URL of the entity. If the property has a complex type, properties of that value can be addressed by further property name composition.<br />
-                First let's take a look at how to get a simple property. The request below returns the <em>Name</em> property of an <em>Airport</em>.</p>
-<p>                <code>GET serviceRoot/Airports('KSFO')/Name </code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-{
-    "@odata.context": "serviceRoot/$metadata#Airports('KSFO')/Name",
-    "value": "San Francisco International Airport"
-}
-{% endhighlight %}
-<p>                Then let's see how to get a property value of a complex type. The request below returns the <em>Address</em> of the complex type <em>Location</em> in an <em>Airport</em>.<br />
-                <code>GET serviceRoot/Airports('KSFO')/Location/Address </code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-{
-"@odata.context": "serviceRoot/$metadata#Airports('KSFO')/Location/Address",
-"value": "South McDonnell Road, San Francisco, CA 94128"
-}
-{% endhighlight %}
-</p></div>
-<div id="propertyVal">
-<h3>Requesting an Individual Property Raw Value</h3>
-<p>                To address the raw value of a primitive property, clients append a path segment containing the string <code>$value</code> to the property URL. The request below returns the raw value of property <em>Name</em> of an <em>Airport</em>.<br />
-                <code>GET serviceRoot/Airports('KSFO')/Name/$value </code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-San Francisco International Airport
-{% endhighlight %}
-</p></div>
-</p></div>
-<div id="queryData">
-<h2 class="page-header">Querying Data</h2>
-<p>            OData supports various kinds of query options for querying data. This section will help you go through the common scenarios for these query options.</p>
-<div id="filter">
-<h3>System Query Option $filter</h3>
-<p>                The <code>$filter</code> system query option allows clients to filter a collection of resources that are addressed by a request URL. The expression specified with <code>$filter</code> is evaluated for each resource in the collection, and only items where the expression evaluates to true are included in the response.</p>
-<div id="basic">
-<h4>Basic predicates, built-in functions</h4>
-<p>                    There are several kinds of basic predicates and built-in functions for <code>$filter</code>, including logical operators and arithmetic operators. For more detailed information, please refer to <a href="https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part2-url-conventions.html">OData V4 URL Conventions Document</a>. The request below using <code>$filter</code> to get people with FirstName "Scott".<br />
-                    <code>GET serviceRoot/People?$filter=FirstName eq 'Scott'</code><br />
-                    <br />
-                    Response Payload</p>
-{% highlight javascript%}
-{
-    "@odata.context": "serviceRoot/$metadata#People",
-    "value": [
-        {
-            "@odata.id": "serviceRoot/People('scottketchum')",
-        "@odata.etag": "W/"08D1694C7E510464"",
-            "@odata.editLink": "serviceRoot/People('scottketchum')",
-            "UserName": "scottketchum",
-            "FirstName": "Scott",
-            "LastName": "Ketchum",
-            "Emails": [
-                "Scott@example.com"
-            ],
-            "AddressInfo": [
-                {
-                    "Address": "2817 Milton Dr.",
-                    "City": {
-                        "CountryRegion": "United States",
-                        "Name": "Albuquerque",
-                        "Region": "NM"
-                    }
-                }
-            ],
-            "Gender": "Male",
-            "Concurrency": 635404799693620400
-        }
-    ]
-}
-{% endhighlight %}
-</p></div>
-<div id="complexType">
-<h4>Filter on Complex Type</h4>
-<p>                    <code>$filter</code> can also work on complex type. The request below returns airports with "San Francisco" contained in its <em>Address</em>. And <em>Address</em> is property of complex type <em>Location</em>.</p>
-<p>                    <code>GET serviceRoot/Airports?$filter=contains(Location/Address, 'San Francisco')</code><br />
-                    <br />
-                    Response Payload</p>
-{% highlight javascript%}
-{
-    "@odata.context": "serviceRoot/$metadata#Airports",
-    "value": [
-        {
-            "@odata.id": "serviceRoot/Airports('KSFO')",
-            "@odata.editLink": "serviceRoot/Airports('KSFO')",
-            "IcaoCode": "KSFO",
-            "Name": "San Francisco International Airport",
-            "IataCode": "SFO",
-            "Location": {
-                "Address": "South McDonnell Road, San Francisco, CA 94128",
-                "City": {
-                    "CountryRegion": "United States",
-                    "Name": "San Francisco",
-                    "Region": "California"
-                },
-                "Loc": {
-                    "type": "Point",
-                    "coordinates": [
-                        -122.374722222222,
-                        37.6188888888889
-                    ],
-                    "crs": {
-                        "type": "name",
-                        "properties": {
-                            "name": "EPSG:4326"
-                        }
-                    }
-                }
-            }
-        }
-    ]
-}
-{% endhighlight %}
-</p></div>
-<div id="filterEnum">
-<h4>Filter on Enum Properties</h4>
-<p>                    The request below returns all female People of entity type <em>Person</em>. The <em>Gender</em> is a property of <code>Enum</code> type.<br />
-                    <code>GET serviceRoot/People?$filter=Gender eq Microsoft.OData.SampleService.Models.TripPin.PersonGender'Female' </code><br />
-                    <br />
-                    Response Payload</p>
-{% highlight javascript%}
-{
-    "@odata.context": "serviceRoot/$metadata#People",
-    "@odata.nextLink": "serviceRoot/People?%24filter=Gender+eq+Microsoft.OData.SampleService.Models.TripPin.PersonGender%27Female%27&%24skiptoken=8",
-    "value": [
-        {
-            "@odata.id": "serviceRoot/People('elainestewart')",
-            "@odata.etag": "W/"08D1694CCFB34453"",
-            "@odata.editLink": "serviceRoot/People('elainestewart')",
-            "UserName": "elainestewart",
-            "FirstName": "Elaine",
-            "LastName": "Stewart",
-            "Emails": [
-                "Elaine@example.com",
-                "Elaine@contoso.com"
-            ],
-            "AddressInfo": [],
-            "Gender": "Female",
-            "Concurrency": 635404801059013800
-        },
-        ......
-        ,
-        {
-            "@odata.id": "serviceRoot/People('ursulabright')",
-            "@odata.etag": "W/"08D1694CCFB34453"",
-            "@odata.editLink": "serviceRoot/People('ursulabright')",
-            "UserName": "ursulabright",
-            "FirstName": "Ursula",
-            "LastName": "Bright",
-            "Emails": [
-                "Ursula@example.com",
-                "Ursula@contoso.com"
-            ],
-            "AddressInfo": [],
-            "Gender": "Female",
-            "Concurrency": 635404801059013800
-        }
-    ]
-}
-{% endhighlight %}
-</p></div>
-<div id="nestedFilter">
-<h4>Nested Filter in Expand</h4>
-<p>                    OData V4 supports nested filters in <code>$expand</code>. The request below return <em>People</em> and all their trips with Name "Trip in US".<br />
-                    <code>GET serviceRoot/People?$expand=Trips($filter=Name eq 'Trip in US')</code><br />
-                    <br />
-                    Response Payload</p>
-{% highlight javascript%}
-{
-    "@odata.context": "serviceRoot/$metadata#People",
-    "@odata.nextLink": "serviceRoot/People?%24expand=Trips(%24filter%3dName+eq+%27Trip+in+US%27)&%24skiptoken=8",
-    "value": [
-        {
-            "@odata.id": "serviceRoot/People('russellwhyte')",
-            "@odata.etag": "W/"08D1694D0DBBD9DB"",
-            "@odata.editLink": "serviceRoot/People('russellwhyte')",
-            "UserName": "russellwhyte",
-            "FirstName": "Russell",
-            "LastName": "Whyte",
-            "Emails": [
-                "Russell@example.com",
-                "Russell@contoso.com"
-            ],
-            "AddressInfo": [
-                {
-                    "Address": "187 Suffolk Ln.",
-                    "City": {
-                        "CountryRegion": "United States",
-                        "Name": "Boise",
-                        "Region": "ID"
-                    }
-                }
-            ],
-            "Gender": "Male",
-            "Concurrency": 635404802099763700,
-            "Trips@odata.context": "serviceRoot/$metadata#People('russellwhyte')/Trips",
-            "Trips": [
-                {
-                    "TripId": 1001,
-                    "ShareId": "9d9b2fa0-efbf-490e-a5e3-bac8f7d47354",
-                    "Description": "Trip from San Francisco to New York City",
-                    "Name": "Trip in US",
-                    "Budget": 3000,
-                    "StartsAt": "2014-01-01T00:00:00Z",
-                    "EndsAt": "2014-01-04T00:00:00Z",
-                    "Tags": [
-                        "business",
-                        "New York meeting"
-                    ]
-                }
-            ]
-        },
-        ......
-        ,
-        {
-            "@odata.id": "serviceRoot/People('keithpinckney')",
-            "@odata.etag": "W/"08D1694D0DBBD9DB"",
-            "@odata.editLink": "serviceRoot/People('keithpinckney')",
-            "UserName": "keithpinckney",
-            "FirstName": "Keith",
-            "LastName": "Pinckney",
-            "Emails": [
-                "Keith@example.com",
-                "Keith@contoso.com"
-            ],
-            "AddressInfo": [],
-            "Gender": "Male",
-            "Concurrency": 635404802099763700,
-            "Trips@odata.context": "serviceRoot/$metadata#People('keithpinckney')/Trips",
-            "Trips": []
-        }
-    ]
-}
-{% endhighlight %}
-</p></div>
-</p></div>
-<div id="orderby">
-<h3>System Query Option $orderby</h3>
-<p>                The <code>$orderby</code> system query option allows clients to request resources in either ascending order using <code>asc</code> or descending order using <code>desc</code>. If <code>asc</code> or <code>desc</code> not specified, then the resources will be ordered in ascending order. The request below orders <em>Trips</em> on property <em>EndsAt</em> in descending order.</p>
-<p>                <code>GET serviceRoot/People('scottketchum')/Trips?$orderby=EndsAt desc</code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-{
-    "@odata.context": "serviceRoot/$metadata#People('scottketchum')/Trips",
-    "value": [
-        {
-            "TripId": 2004,
-            "ShareId": "f94e9116-8bdd-4dac-ab61-08438d0d9a71",
-            "Description": "Trip from Shanghai to Beijing",
-            "Name": "Trip in Beijing",
-            "Budget": 11000,
-            "StartsAt": "2014-02-01T00:00:00Z",
-            "EndsAt": "2014-02-04T00:00:00Z",
-            "Tags": [
-                "Travel",
-                "Beijing"
-            ]
-        },
-        {
-            "TripId": 2002,
-            "ShareId": "9d9b2fa0-efbf-490e-a5e3-bac8f7d47354",
-            "Description": "Trip from San Francisco to New York City",
-            "Name": "Trip in US",
-            "Budget": 5000,
-            "StartsAt": "2014-01-01T00:00:00Z",
-            "EndsAt": "2014-01-04T00:00:00Z",
-            "Tags": [
-                "business",
-                "New York meeting"
-            ]
-        }
-    ]
-}
-{% endhighlight %}
-</p></div>
-<div id="topskip">
-<h3>System Query Option $top and $skip</h3>
-<p>                The <code>$top</code> system query option requests the number of items in the queried collection to be included in the result. The $skip query option requests the number of items in the queried collection that are to be skipped and not included in the result.<br />
-                The request below returns the first two people of the <em>People</em> entity set.</p>
-<p>                <code>GET serviceRoot/People?$top=2 </code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-{
-    "@odata.context": "serviceRoot/$metadata#People",
-    "value": [
-        {
-            "@odata.id": "serviceRoot/People('russellwhyte')",
-            "@odata.etag": "W/"08D1694D4AA4A8D1"",
-            "@odata.editLink": "serviceRoot/People('russellwhyte')",
-            "UserName": "russellwhyte",
-            "FirstName": "Russell",
-            "LastName": "Whyte",
-            "Emails": [
-                "Russell@example.com",
-                "Russell@contoso.com"
-            ],
-            "AddressInfo": [
-                {
-                    "Address": "187 Suffolk Ln.",
-                    "City": {
-                        "CountryRegion": "United States",
-                        "Name": "Boise",
-                        "Region": "ID"
-                    }
-                }
-            ],
-            "Gender": "Male",
-            "Concurrency": 635404803121654000
-        },
-        {
-            "@odata.id": "serviceRoot/People('scottketchum')",
-            "@odata.etag": "W/"08D1694D4AA4A8D1"",
-            "@odata.editLink": "serviceRoot/People('scottketchum')",
-            "UserName": "scottketchum",
-            "FirstName": "Scott",
-            "LastName": "Ketchum",
-            "Emails": [
-                "Scott@example.com"
-            ],
-            "AddressInfo": [
-                {
-                    "Address": "2817 Milton Dr.",
-                    "City": {
-                        "CountryRegion": "United States",
-                        "Name": "Albuquerque",
-                        "Region": "NM"
-                    }
-                }
-            ],
-            "Gender": "Male",
-            "Concurrency": 635404803121654000
-        }
-    ]
-}
-{% endhighlight %}
-<p>                The request below returns people starting with the 19th people of the entity set <em>People</em></p>
-<p>                <code>GET serviceRoot/People?$skip=18 </code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-{
-    "@odata.context": "serviceRoot/$metadata#People",
-    "value": [
-        {
-            "@odata.id": "serviceRoot/People('genevievereeves')",
-            "@odata.etag": "W/"08D1694D8B408D60"",
-            "@odata.editLink": "serviceRoot/People('genevievereeves')",
-            "UserName": "genevievereeves",
-            "FirstName": "Genevieve",
-            "LastName": "Reeves",
-            "Emails": [
-                "Genevieve@example.com",
-                "Genevieve@contoso.com"
-            ],
-            "AddressInfo": [],
-            "Gender": "Female",
-            "Concurrency": 635404804205612400
-        },
-        {
-            "@odata.id": "serviceRoot/People('kristakemp')",
-            "@odata.etag": "W/"08D1694D8B408D60"",
-            "@odata.editLink": "serviceRoot/People('kristakemp')",
-            "UserName": "kristakemp",
-            "FirstName": "Krista",
-            "LastName": "Kemp",
-            "Emails": [
-                "Krista@example.com"
-            ],
-            "AddressInfo": [],
-            "Gender": "Female",
-            "Concurrency": 635404804205612400
-        }
-    ]
-}
-{% endhighlight %}
-</p></div>
-<div id="count">
-<h3>System Query Option $count</h3>
-<p>                The <code>$count</code> system query option allows clients to request a count of the matching resources included with the resources in the response.<br />
-                The request below returns the total number of people in the collection.</p>
-<p>                <code>GET serviceRoot/People?$count=true</code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-20
-{% endhighlight %}
-</p></div>
-<div id="expand">
-<h3>System Query Option $expand</h3>
-<p>                The <code>$expand</code> system query option specifies the related resources to be included in line with retrieved resources. The request below returns people with navigation property <em>Friends</em> of a <em>Person</em></p>
-<p>                <code>GET serviceRoot/People('keithpinckney')?$expand=Friends </code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-{
-    "@odata.context": "serviceRoot/$metadata#People/$entity",
-    "@odata.id": "serviceRoot/People('keithpinckney')",
-    "@odata.etag": "W/"08D1694E2BB4317A"",
-    "@odata.editLink": "serviceRoot/People('keithpinckney')",
-    "UserName": "keithpinckney",
-    "FirstName": "Keith",
-    "LastName": "Pinckney",
-    "Emails": [
-        "Keith@example.com",
-        "Keith@contoso.com"
-    ],
-    "AddressInfo": [],
-    "Gender": "Male",
-    "Concurrency": 635404806897545600,
-    "Friends": [
-        {
-            "@odata.id": "serviceRoot/People('clydeguess')",
-            "@odata.etag": "W/"08D1694E2BB4317A"",
-            "@odata.editLink": "serviceRoot/People('clydeguess')",
-            "UserName": "clydeguess",
-            "FirstName": "Clyde",
-            "LastName": "Guess",
-            "Emails": [
-                "Clyde@example.com"
-            ],
-            "AddressInfo": [],
-            "Gender": "Male",
-            "Concurrency": 635404806897545600
-        },
-        {
-            "@odata.id": "serviceRoot/People('marshallgaray')",
-            "@odata.etag": "W/"08D1694E2BB4317A"",
-            "@odata.editLink": "serviceRoot/People('marshallgaray')",
-            "UserName": "marshallgaray",
-            "FirstName": "Marshall",
-            "LastName": "Garay",
-            "Emails": [
-                "Marshall@example.com",
-                "Marshall@contoso.com"
-            ],
-            "AddressInfo": [],
-            "Gender": "Male",
-            "Concurrency": 635404806897545600
-        }
-    ]
-}
-{% endhighlight %}
-</p></div>
-<div id="select">
-<h3>System Query Option $select</h3>
-<p>                The <code>$select</code> system query option allows the clients to requests a limited set of properties for each entity <s>or complex type</s>. The request below returns <em>Name</em> and <em>IcaoCode</em> of all <em>Airports</em>.</p>
-<p>                <code>GET serviceRoot/Airports?$select=Name, IcaoCode</code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-{
-    "@odata.context": "serviceRoot/$metadata#Airports(Name,IcaoCode)",
-    "value": [
-        {
-            "@odata.id": "serviceRoot/Airports('KSFO')",
-            "@odata.editLink": "serviceRoot/Airports('KSFO')",
-            "Name": "San Francisco International Airport",
-            "IcaoCode": "KSFO"
-        },
-        ......
-        ,
-        {
-            "@odata.id": "serviceRoot/Airports('KJFK')",
-            "@odata.editLink": "serviceRoot/Airports('KJFK')",
-            "Name": "John F. Kennedy International Airport",
-            "IcaoCode": "KJFK"
-        }
-    ]
-}
-{% endhighlight %}
-</p></div>
-<div id="search">
-<h3>System Query Option $search</h3>
-<p>                The $search system query option restricts the result to include only those entities matching the specified search expression. The definition of what it means to match is dependent upon the implementation. The request below get all <em>People</em> who has 'Boise' in their contents.</p>
-<p>                <code>serviceRoot/People?$search=Boise</code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-{
-    "@odata.context": "serviceRoot/$metadata#People",
-    "value": [
-        {
-            "@odata.id": "serviceRoot/People('russellwhyte')",
-            "@odata.etag": "W/"08D1694E90C0914C"",
-            "@odata.editLink": "serviceRoot/People('russellwhyte')",
-            "UserName": "russellwhyte",
-            "FirstName": "Russell",
-            "LastName": "Whyte",
-            "Emails": [
-                "Russell@example.com",
-                "Russell@contoso.com"
-            ],
-            "AddressInfo": [
-                {
-                    "Address": "187 Suffolk Ln.",
-                    "City": {
-                        "CountryRegion": "United States",
-                        "Name": "Boise",
-                        "Region": "ID"
-                    }
-                }
-            ],
-            "Gender": "Male",
-            "Concurrency": 635404808592855400
-        }
-    ]
-}
-{% endhighlight %}
-</p></div>
-<div id="lambda">
-<h3>Lambda Operators</h3>
-<p>                OData defines two operators <code>any</code> and <code>all</code> that evaluate a Boolean expression on a collection. They can work on either collection properties or collection of entities.</p>
-<p>                The request below returns <em>People</em> with <em>Emails</em> containing "ll@contoso.com". The <em>Emails</em> is a collection of primitive type <em>string</em>.</p>
-<p>                <code>GET serviceRoot/People?$filter=Emails/any(s:endswith(s, 'contoso.com'))</code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-{
-    "@odata.context": "serviceRoot/$metadata#People",
-    "value": [
-        {
-            "@odata.id": "serviceRoot/People('russellwhyte')",
-            "@odata.etag": "W/"08D1694ECB6F8E7D"",
-            "@odata.editLink": "serviceRoot/People('russellwhyte')",
-            "UserName": "russellwhyte",
-            "FirstName": "Russell",
-            "LastName": "Whyte",
-            "Emails": [
-                "Russell@example.com",
-                "Russell@contoso.com"
-            ],
-            "AddressInfo": [
-                {
-                    "Address": "187 Suffolk Ln.",
-                    "City": {
-                        "CountryRegion": "United States",
-                        "Name": "Boise",
-                        "Region": "ID"
-                    }
-                }
-            ],
-            "Gender": "Male",
-            "Concurrency": 635404809577402000
-        },
-        {
-            "@odata.id": "serviceRoot/People('marshallgaray')",
-            "@odata.etag": "W/"08D1694ECB6F8E7D"",
-            "@odata.editLink": "serviceRoot/People('marshallgaray')",
-            "UserName": "marshallgaray",
-            "FirstName": "Marshall",
-            "LastName": "Garay",
-            "Emails": [
-                "Marshall@example.com",
-                "Marshall@contoso.com"
-            ],
-            "AddressInfo": [],
-            "Gender": "Male",
-            "Concurrency": 635404809577402000
-        }
-    ]
-}
-{% endhighlight %}
-<p>                The request below returns the friends of <em>Me</em> who have friends using "Scott" as their <em>FirstName</em>.</p>
-<p>                <code>GET serviceRoot/Me/Friends?$filter=Friends/any(f:f/FirstName eq 'Scott')</code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-{
-    "@odata.context": "serviceRoot/$metadata#People",
-    "value": [
-        {
-            "@odata.id": "serviceRoot/People('russellwhyte')",
-            "@odata.etag": "W/"08D1694EE92CB5C3"",
-            "@odata.editLink": "serviceRoot/People('russellwhyte')",
-            "UserName": "russellwhyte",
-            "FirstName": "Russell",
-            "LastName": "Whyte",
-            "Emails": [
-                "Russell@example.com",
-                "Russell@contoso.com"
-            ],
-            "AddressInfo": [
-                {
-                    "Address": "187 Suffolk Ln.",
-                    "City": {
-                        "CountryRegion": "United States",
-                        "Name": "Boise",
-                        "Region": "ID"
-                    }
-                }
-            ],
-            "Gender": "Male",
-            "Concurrency": 635404810076337700
-        },
-        {
-            "@odata.id": "serviceRoot/People('ronaldmundy')",
-            "@odata.etag": "W/"08D1694EE92CB5C3"",
-            "@odata.editLink": "serviceRoot/People('ronaldmundy')",
-            "UserName": "ronaldmundy",
-            "FirstName": "Ronald",
-            "LastName": "Mundy",
-            "Emails": [
-                "Ronald@example.com",
-                "Ronald@contoso.com"
-            ],
-            "AddressInfo": [],
-            "Gender": "Male",
-            "Concurrency": 635404810076337700
-        }
-    ]
-}
-{% endhighlight %}
-</p></div>
-</p></div>
-<div id="modifyData">
-<h2 class="page-header">Data Modification</h2>
-<p>            Updatable OData services support Create, Update and Delete operation for some or all exposed entities.</p>
-<div id="create">
-<h3>Create an Entity</h3>
-<p>                To create an entity in a collection, the client sends a POST request to that collection's URL. The POST body MUST contain a single valid entity representation. The request below creates a <em>Person</em> which contains complex type and collection property. </p>
-<p>                <code><br />
-                    POST serviceRoot/People<br />
-                    OData-Version: 4.0<br />
-                    Content-Type: application/json;odata.metadata=minimal<br />
-                    Accept: application/json</p>
-<p>                    {<br />
-                    "@odata.type" : "Microsoft.OData.SampleService.Models.TripPin.Person",<br />
-                    "UserName": "teresa",<br />
-                    "FirstName" : "Teresa",<br />
-                    "LastName" : "Gilbert",<br />
-                    "Gender" : "Female",<br />
-                    "Emails" : ["teresa@example.com", "teresa@contoso.com"],<br />
-                    "AddressInfo" : [<br />
-                    {<br />
-                    "Address" : "1 Suffolk Ln.",<br />
-                    "City" :<br />
-                    {<br />
-                    "CountryRegion" : "United States",<br />
-                    "Name" : "Boise",<br />
-                    "Region" : "ID"<br />
-                    }<br />
-                    }]<br />
-                    }<br />
-                </code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-HTTP/1.1 201 Created
-Content-Length: 468
-Content-Type: application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8
-Location: serviceRoot/People('teresa')
-OData-Version: 4.0
-{
-    "@odata.context":"serviceRoot/$metadata#People/$entity",
-    "@odata.id":"serviceRoot/People('teresa')",
-    "@odata.editLink":"serviceRoot/People('teresa')",
-    "UserName":"teresa",
-    "FirstName":"Teresa",
-    "LastName":"Gilbert",
-    "Emails":["teresa@example.com","teresa@contoso.com"],
-    "AddressInfo":[{"Address":"1 Suffolk Ln.","City":{"CountryRegion":"United States","Name":"Boise","Region":"ID"}}],
-    "Gender":"Female"
-}
-{% endhighlight %}
-</p></div>
-<div id="delete">
-<h3>Remove an Entity</h3>
-<p>                The request below deletes the <em>Person</em> with <em>UserName</em> 'vincentcalabrese'.<br />
-                <code>DELETE serviceRoot/People('vincentcalabrese') </code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-HTTP/1.1 204 No Content
-OData-Version: 4.0
-{% endhighlight %}
-</p></div>
-<div id="update">
-<h3>Update an Entity</h3>
-<p>                The OData services SHOULD support PATCH as the preferred means of updating an entity. But also services MAY additionally support PUT. The request below update the <em>Emails</em> of a person using PATCH. </p>
-<p>                <code><br />
-                    PATCH serviceRoot/People('russellwhyte')<br />
-                    OData-Version: 4.0<br />
-                    Content-Type: application/json;odata.metadata=minimal<br />
-                    Accept: application/json</p>
-<p>                    {<br />
-                    "@odata.type" : "Microsoft.OData.SampleService.Models.TripPin.Person",<br />
-                    "Emails" :  ["Russell@example.com", "Russell@contoso.com", "newRussell@contoso.com"]<br />
-                    }<br />
-                </code><br />
-                <br />
-                Response Payload</p>
-{% highlight javascript%}
-HTTP/1.1 204 No Content
-{% endhighlight %}
-</p></div>
-<div id="relationship">
-<h3>Relationship Operations</h3>
-<p>                Relationships from one entity to another are represented as navigation properties.</p>
-<div id="linkRelatedEntities">
-<h4>Link to Related Entities</h4>
-<p>                    A successful POST request to a navigation property's references collection adds a relationship to an existing entity. The request below adds 'vincentcalabrese' to friends of 'scottketchum'.<br />
-                    <code><br />
-                        POST serviceRoot/People('scottketchum')/Friends/$ref<br />
-                        OData-Version: 4.0<br />
-                        Content-Type: application/json;odata.metadata=minimal<br />
-                        Accept: application/json</p>
-<p>                        {<br />
-                        "@odata.id": "serviceRoot/People('vincentcalabrese')"<br />
-                        }<br />
-                    </code><br />
-                    <br />
-                    Response Payload</p>
-{% highlight javascript%}
-HTTP/1.1 204 No Content
-{% endhighlight %}
-</p></div>
-<div id="changeLink">
-<h4>Change a Link</h4>
-<p>                    A successful PUT request to a single-valued navigation property’s reference resource changes the related entity. The request below change the <em>Airline</em> of a <em>Flight</em>.<br />
-                    <code>PUT serviceRoot/People('russellwhyte')/Trips(1001)/PlanItems(11)/Microsoft.OData.SampleService.Models.TripPin.Flight/Airline/$ref</code><br />
-                    <code><br />
-                        OData-Version: 4.0<br />
-                        Content-Type: application/json;odata.metadata=minimal<br />
-                        Accept: application/json</p>
-<p>                        {<br />
-                        "@odata.id": "serviceRoot/Airlines('FM')"<br />
-                        }<br />
-                    </code><br />
-                    <br />
-                    Response Payload</p>
-{% highlight javascript%}
-HTTP/1.1 200 OK
-{
-    "@odata.context":"serviceRoot/TripPinServiceRW/$metadata#$ref",
-    "@odata.id":"serviceRoot/People('russellwhyte')/Trips(1001)/PlanItems(11)/Microsoft.OData.SampleService.Models.TripPin.Flight/Airline"
-}
-{% endhighlight %}
-</p></div>
-</p></div>
-<div id="operation">
-<h3>Functions and Actions</h3>
-<p>                OData supports custom operations (Actions and Functions). Functions are operations exposed by an OData service that MUST return data and MUST have no observable side effects. Actions are operations exposed by an OData service that MAY have side effects when invoked. Functions and actions both MAY bound to an entity type, primitive type, complex type, or a collection.</p>
-<div id="unboundedFunction">
-<h4>Invoking Unbound Functions</h4>
-<p>                    The function below returns the nearest airport with the input geography point.<br />
-                    <code>GET serviceRoot/GetNearestAirport(lat = 33, lon = -118)</code><br />
-                    <br />
-                    Response Payload</p>
-{% highlight javascript%}
-Response 200 OK
-{
-    "@odata.context": "serviceRoot/$metadata#Airports/$entity", 
-    "IcaoCode": "KLAX", 
-    "Name": "Los Angeles International Airport", 
-    "IataCode": "LAX", 
-    "Location": {
-       "Address": "1 World Way, Los Angeles, CA, 90045", 
-        "City": {
-            "CountryRegion": "United States", 
-            "Name": "Los Angeles", 
-            "Region": "California"
-        }, 
-        "Loc": {
-            "type": "Point", 
-            "coordinates": [
-                -118.408055555556, 
-                33.9425
-            ], 
-            "crs": {
-                "type": "name", 
-                "properties": {
-                    "name": "EPSG:4326"
-                }
-            }
-        }
-    }
-}
-{% endhighlight %}
-</p></div>
-<div id="boundedFunction">
-<h4>Invoking Bound Functions</h4>
-<p>                    The request below returns the favorite airline of a person, in TripPin service, "favorite airline" means airline which user choose most times. The function GetFavoriteAirline() is bound to <em>Person</em>.<br />
-                    <code>GET serviceRoot/People('russellwhyte')/Microsoft.OData.SampleService.Models.TripPin.GetFavoriteAirline()</code><br />
-                    <br />
-                    Response Payload</p>
-{% highlight javascript%}
-Response 200 OK
-{
-    "@odata.context": "serviceRoot/$metadata#Airlines/$entity", 
-    "@odata.id": "serviceRoot/Airlines('AA')", 
-    "@odata.editLink": "serviceRoot/Airlines('AA')", 
-    "AirlineCode": "AA", 
-    "Name": "American Airlines"
-}
-{% endhighlight %}
-</p></div>
-<div id="unboundedAction">
-<h4>Invoking Unbound Actions</h4>
-<p>                    TripPin currently has no scenario supported for unbound actions.
-                </p></div>
-<div id="boundedAction">
-<h4>Invoking Bound Actions</h4>
-<p>                    The action below shares a trip to one of his friend. In TripPin service, by "share a trip" we mean that the owner and his friend now both have the trip and the trip share the same <em>ShareId</em> property.<br />
-                    <code>POST serviceRoot/People('russellwhyte')/Microsoft.OData.SampleService.Models.TripPin.ShareTrip</code><br />
-                    <code><br />
-                        OData-Version: 4.0<br />
-                        Content-Type: application/json;odata.metadata=minimal<br />
-                        Accept: application/json</p>
-<p>                        {<br />
-                        "userName": "scottketchum",<br />
-                        "tripId": 1001<br />
-                        }<br />
-                    </code><br />
-                    <br />
-                    Response Payload</p>
-{% highlight javascript%}
-HTTP/1.1 204 No Content
-{% endhighlight %}
-</p></div>
-</p></div>
-<div id="etag">
-<h3>ETag</h3>
-<p>                OData V4 supports ETag for Data Modification Request and Action Request. This section demonstrates how to operate on entity with ETag enabled. Please be noted that the ETag value below may be out-of-date, so when you try these requests, please first use the <code>GET</code> request to get the ETag of specified entity.</p>
-<div id="updateEtag">
-<h4>Update Entity with ETag</h4>
-<p>                    The request below shows how to update <em>Person</em> which has ETag supported. Please be noted that the value for <code>If-Match</code> should be the same with the <code>ETag</code> value of the specified Person.<br />
-                    <code><br />
-                        PATCH  serviceRoot/People('clydeguess')<br />
-                        OData-Version: 4.0<br />
-                        Content-Type: application/json;odata.metadata=minimal<br />
-                        Accept: application/json<br />
-                        If-Match: W/"08D15F3DD9126D84"</p>
-<p>                        {<br />
-                        "@odata.type": "#Microsoft.OData.SampleService.Models.TripPin.Person",<br />
-                        "FirstName" : "CLYDE"<br />
-                        }<br />
-                    </code><br />
-                    <br />
-                    Response Payload</p>
-{% highlight javascript%}
-HTTP/1.1 204 No Content
-{% endhighlight %}
-</p></div>
-<div id="deleteEtag">
-<h4>Delete Entity with ETag</h4>
-<p>                    The request below shows how to delete <em>Person</em> which has ETag supported. Please be noted that the value for <code>If-Match</code> should be the same with the <code>ETag</code> value of the specified Person.<br />
-                    <code><br />
-                        DELETE serviceRoot/People('vincentcalabrese')<br />
-                        OData-Version: 4.0<br />
-                        Content-Type: application/json;odata.metadata=minimal<br />
-                        Accept: application/json<br />
-                        If-Match: W/"08D15F3DD9A61539"<br />
-                    </code><br />
-                    <br />
-                    Response Payload</p>
-{% highlight javascript%}
-HTTP/1.1 204 No Content
-{% endhighlight %}
-</p></div>
-</p></div>
-</p></div>
-</div>
-<div class="col-1-12"></div>
-<div class="col-1-4" id="tutorial-contents">
-    <nav class="tutorial-sidebar affix" aria-label="Page Contents" id="affix-navbar">
-        <ul class="nav tutorial-sidenav">
-            <li class="active">
-                <p><a href="#requestData" class="sidenav-link">Requesting Data</a></p>
-                <ul class="nav">
-                    <li><a href="#entitySet">Requesting Entity Collections</a></li>
-                    <li><a href="#entityByID">Requesting an Individual Entity by ID</a></li>
-                    <li><a href="#property">Requesting an Individual Property</a></li>
-                    <li><a href="#propertyVal">Requesting an Individual Property Raw Value</a></li>
-                </ul>
-            </li>
-            <li>
-                <p><a href="#queryData" class="sidenav-link">Querying Data</a></p>
-                <ul class="nav">
-                    <li><a href="#filter">System Query Option $filter</a></li>
-                    <li><a href="#orderby">System Query Option $orderby</a></li>
-                    <li><a href="#topskip">System Query Option $top and $skip</a></li>
-                    <li><a href="#count">System Query Option $count</a></li>
-                    <li><a href="#expand">System Query Option $expand</a></li>
-                    <li><a href="#select">System Query Option $select</a></li>
-                    <li><a href="#search">System Query Option $search</a></li>
-                    <li><a href="#lambda">Lambda Operators</a></li>
-                </ul>
-            </li>
-            <li>
-                <p><a href="#modifyData" class="sidenav-link">Data Modification</a></p>
-                <ul class="nav">
-                    <li><a href="#create">Create an Entity</a></li>
-                    <li><a href="#delete">Delete an Entity</a></li>
-                    <li><a href="#update">Update an Entity</a></li>
-                    <li><a href="#relationship">Relationship Operations</a></li>
-                    <li><a href="#operation">Functions and Actions</a></li>
-                    <li><a href="#etag">ETag</a></li>
-                </ul>
-            </li>
-        </ul>
-    </nav>
-</div>
-</div>
-
-<!--/body-->
-<script type="text/javascript">
-    $(".page-header").css({"width":"66.66%"});
-    const storeScroll = () => {
-        document.documentElement.dataset.scroll = window.scrollY;
-        var heightScrolled = window.scrollY;
-        var defaultHeight = 100;
-        if (heightScrolled < defaultHeight) {
-            $('#affix-navbar').removeClass("affix-top-30");
-          $('#affix-navbar').addClass("affix-top-50");
-            }
-        else{
-          $('#affix-navbar').removeClass("affix-top-50");
-          $('#affix-navbar').addClass("affix-top-30"); 
-            }
-    };
-
-    // Listen for new scroll events
-    document.addEventListener("scroll", storeScroll);
-
-    // Update scroll position for first time
-    storeScroll();
-    
-</script>
\ No newline at end of file
diff --git a/pages/getting-started/getting-started.md b/pages/getting-started/getting-started.md
deleted file mode 100644
index 77d005ee..00000000
--- a/pages/getting-started/getting-started.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-layout: page
-title: Getting Started
-date: 2014-08-08 02:59:36.000000000 +08:00
-permalink: /getting-started/
----
-
-OData has specifications that cover almost every aspect of a RESTful API. But getting started with OData is pretty easy.
-
-## For absolute beginners
-
-The [Understand OData in 6 steps](/getting-started/understand-odata-in-6-steps) tutorial captures the most representative scenarios of OData and REST. It has detailed description of the scenarios and has sample code snippets on different programming platforms to showcase how an OData based RESTful API can be consumed.
-
-<h2>Basic Tutorial</h2>
-<p>The <a href="/getting-started/basic-tutorial">basic tutorial</a> will walk brand-new developers through the absolute basics of requesting, querying, and modifying resources in an OData service. Since OData is best practices for REST APIs, this tutorial will feel a lot like documentation you might read for a custom REST API - but you can apply the principles you learn here to <em>all</em> OData APIs.</p>
-<h2>Advanced Tutorial</h2>
-<p>The <a href="/getting-started/advanced-tutorial">advanced tutorial</a> will continue the lesson by introducing more advanced concepts such as:</p>
-<ul>
-<li>Dynamic types</li>
-<li>Type inheritance</li>
-<li>Batch requests</li>
-</ul>
-<p>As with the basic tutorial, all of the principles in the advanced tutorial can be applied to any OData API.</p>
-<h2>Postman Tutorial</h2>
-<p>Do you prefer to learn by doing? The <a href="/getting-started/learning-odata-on-postman">Postman tutorial</a> will walk you through more than 20 real OData requests and responses. The tutorial is designed to use the <a href="/odata-services">TripPin reference service</a> but again, the principles here can be applied to any OData API.</p>
diff --git a/pages/libraries.html b/pages/libraries.html
index 847d3673..07ee1f74 100644
--- a/pages/libraries.html
+++ b/pages/libraries.html
@@ -4,97 +4,127 @@
 date: 2014-02-20 06:57:09.000000000 +08:00
 permalink: /libraries/
 ---
-<div aria-label="Languages" id="tabs">
-  <ul role="tablist" class="nav nav-tabs" id="tablinks">
-    <li role="presentation" class="active">
-      <a class="tab-link" href="#net1" aria-label=".net" role="tab" data-toggle="tab" aria-controls="net1">.NET</a>
-    </li>
-    <li role="presentation">
-      <a class="tab-link" href="#java" aria-label="Java" role="tab" data-toggle="tab" aria-controls="java" tabindex="-1">Java</a>
-    </li>
-    <li role="presentation">
-      <a class="tab-link" href="#javascript" aria-label="JavaScript" role="tab" data-toggle="tab" aria-controls="javascript" tabindex="-1">JavaScript</a>
-    </li>
-    <li role="presentation">
-      <a class="tab-link" href="#cpp" aria-label="C++" role="tab" data-toggle="tab" aria-controls="cpp" tabindex="-1">C++</a>
-    </li>
-    <li role="presentation">
-      <a class="tab-link" href="#other" aria-label="Other Platforms" role="tab" data-toggle="tab" aria-controls="other" tabindex="-1">Other Platforms</a>
-    </li>
-  </ul>
-  <div class="tab-content">
-    <div class="tab-pane active" id="net1" role="tabpanel" tabindex="0">
-      <table class="table table-striped table-condensed table-hover reflows" aria-label=".NET Libraries">
-        <thead>
-        <tr>
-          <th>Name</th>
-          <th>Description</th>
-          <th>Support OData version(s)</th>
-          <th>For server/client</th>
-          <th>Download from</th>
-        </tr>
-      </thead>
-      <tbody>
-        {% assign nets = site.libraries | where: "category", "net" | sort: "rownumber", 'first' | reverse %}
-        {% for net in nets %}
-        <tr>
-          <td>
-            {% if net.link %}
-            <a href={{net.link}}>{{net.name}}</a>
-            {% else %}
-            {{net.name}}
-            {% endif %}
-          </td>
-          <td>{{net.content | markdownify}}</td>
-          <td>{{net.version}}</td>
-          <td>{{net.object}}</td>
-          <td>{% for download in net.downloads %}
-            {% if download.source != net.downloads[0].source %},&nbsp{% endif %}
-            <a href={{download.link}} target="_blank">{{download.source}}</a>
-          {% endfor %}</td>
-        </tr>
-        {% endfor %}
-      </tbody>
-      </table>
-    </div>
-    
-    {% assign libraries = site.libraries | group_by: "category" %}
-    {% for library in libraries %}
-    {% if library.name != "net" %}
+<div class="row">
+    <div class="col-md-10" style="padding-bottom:9px; margin:0 0 20px;">
+        <p>Below we have collected a list of OData libraries in a variety of languages, which will continue to grow along with the OData ecosystem. If you'd like to add/update information on an OData library, please do!</p>
+        <div style="display:flex; justify-content: center; border-bottom:1px solid #eeeeee">
+            <a class="big-action"
+                href="https://github.com/ODataOrg/odataorg.github.io"
+			    style="margin-top:2rem; margin-bottom: 2rem;">
+			    Contribute
+		    </a>
+            <!-- TODO: link to contributions form page after completion. -->
+            <!--<a class="big-action"
+                    href="/contribute/"
+                    style="margin-top:2rem; margin-bottom: 2rem;">
+                Contribute
+            </a>-->
+        </div>
+</div>
+<div class="col-md-10">
+    <ul class="nav nav-pills">
+        <li class="active">
+            <a class="tab-link" href="#net1" data-toggle="pill" aria-controls="net1">.NET</a>
+        </li>
+        <li>
+            <a class="tab-link" href="#java" data-toggle="pill" aria-controls="java">Java</a>
+        </li>
+        <li>
+            <a class="tab-link" href="#javascript" data-toggle="pill" aria-controls="javascript">JavaScript</a>
+        </li>
+        <li>
+            <a class="tab-link" href="#cpp" data-toggle="pill" aria-controls="cpp">C++</a>
+        </li>
+        <li>
+            <a class="tab-link" href="#other" data-toggle="pill" aria-controls="other">Other Platforms</a>
+        </li>
+    </ul>
+</div>
+<div class="col-md-10">
+    <div class="tab-content">
+        <div class="tab-pane active" id="net1" role="tabpanel" tabindex="0">
+            <table class="table table-striped table-condensed table-hover reflows" aria-label=".NET Libraries">
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                        <th>OData Version(s) Supported</th>
+                        <th>For Server/Client</th>
+                        <th>Download From</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% assign nets = site.libraries | where: "category", "net" | sort: "rownumber", "last" | sort: "featured" | reverse %}
+                    {% for net in nets %}
+                    {% assign featuredBool = net.featured | boolean %}
+                    {% if featuredBool == true %} <!-- Explicit comparison appears to be required for appropriate value evaluation -->
+                    <tr class="featured">
+                        {% else %}
+                    <tr>
+                        {% endif %}
+                        <td>
+                            {% if net.link %}
+                            <a href={{net.link}}>{{net.name}}</a>
+                            {% else %}
+                            {{net.name}}
+                            {% endif %}
+                        </td>
+                        <td>{{net.content | markdownify}}</td>
+                        <td>{{net.version}}</td>
+                        <td>{{net.object}}</td>
+                        <td>
+                            {% for download in net.downloads %}
+                            {% if download.source != net.downloads[0].source %},&nbsp{% endif %}
+                            <a href={{download.link}} target="_blank">{{download.source}}</a>
+                            {% endfor %}
+                        </td>
+                        </>
+                        {% endfor %}
+                </tbody>
+            </table>
+        </div>
+
+        {% assign libraries = site.libraries | group_by: "category" %}
+        {% for library in libraries %}
+        {% if library.name != "net" %}
 
-    <div class="tab-pane" id="{{library.name}}" role="tabpanel" hidden>
-      <table class="table table-striped table-condensed table-hover reflows" aria-label="{{library.name}} Libraries">
-        <thead>
-        <tr>
-          <th>Name</th>
-          <th>Description</th>
-          <th>Support OData version(s)</th>
-          <th>For server/client</th>
-          <th>Download from</th>
-        </tr>
-      </thead>
-      <tbody>
-        {% assign items = library.items | sort: "rownumber", 'first' | reverse %}
-        {% for item in items %}
-        <tr>
-          <td>{{item.name}}</td>
-          <td>{{item.content | markdownify}}</td>
-          <td>{{item.version}}</td>
-          <td>{{item.object}}</td>
-          <td>{% for download in item.downloads %}
-            {% if download.source != item.downloads[0].source %},&nbsp{% endif %}
-            <a href={{download.link}} target="_blank">{{download.source}}</a>
-          {% endfor %}</td>
-        </tr>
+        <div class="tab-pane" id="{{library.name}}" role="tabpanel" hidden>
+            <table class="table table-striped table-condensed table-hover reflows" aria-label="{{library.name}} Libraries">
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                        <th>Support OData version(s)</th>
+                        <th>For server/client</th>
+                        <th>Download from</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% assign items = library.items | sort: "rownumber", "last" | sort: "featured" | reverse %}
+                    {% for item in items %}
+                    {% assign featuredItemBool = item.featured | boolean %}
+                    {% if featuredItemBool == true %} <!-- Explicit comparison appears to be required for appropriate value evaluation -->
+                    <tr class="featured">
+                        {% else %}
+                    <tr>
+                        {% endif %}
+                        <td>{{item.name}}</td>
+                        <td>{{item.content | markdownify}}</td>
+                        <td>{{item.version}}</td>
+                        <td>{{item.object}}</td>
+                        <td>
+                            {% for download in item.downloads %}
+                            {% if download.source != item.downloads[0].source %},&nbsp{% endif %}
+                            <a href={{download.link}} target="_blank">{{download.source}}</a>
+                            {% endfor %}
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+        {% endif %}
         {% endfor %}
-      </tbody>
-      </table>
     </div>
-    {% endif %}
-    {% endfor %}
-  </div>
-<div>
-</div>
-  <h4>Contribute to OData Libraries</h4>
-  <p>Want to add/update information of an OData library? You can edit and submit changes to this page on its <a href="https://github.com/ODataOrg/odataorg.github.io" target="_blank">Github repository</a>.</p>
 </div>
+</div>
\ No newline at end of file
diff --git a/pages/tools.html b/pages/tools.html
new file mode 100644
index 00000000..9f8b0a45
--- /dev/null
+++ b/pages/tools.html
@@ -0,0 +1,20 @@
+---
+layout: page
+title: Tools
+permalink: /tools/
+---
+<script type="text/javascript" src="/assets/scripts/enterLink.js"></script>
+
+<div class="container">
+    <div class="row">
+        <div class="items-container centered" style="flex-wrap:wrap; align-content:space-between">
+            {% for tool in site.tools %}
+            <div class="card" tabindex="0" onkeypress="enterLink(event, '{{tool.link}}')" onclick="location.href='{{tool.link}}'" style="flex-basis:47%">
+                <h4>{{tool.title}}</h4>
+                <img src="{{tool.image-path | prepend: site.baseurl | prepend: site.url}}" alt={{tool.image-alt}} />
+                <p>{{tool.content}}</p>
+            </div>
+            {% endfor %}
+        </div>
+    </div>
+</div>
diff --git a/public/css/site.css b/public/css/site.css
index a59d209c..c9fc2d39 100644
--- a/public/css/site.css
+++ b/public/css/site.css
@@ -1,8 +1,11 @@
+h2 {
+    color: var(--orange-medium);
+}
 .theme-font{
   color: #dd4814;
 }
 .navbar-default {
-	background-color: #d24714;
+    background-color: var(--orange-medium);
 }
 .jumbotron {
   background-color: transparent;
@@ -13,47 +16,11 @@
 .jumbotron .p{
   color: black;
 }
-.carousel {
-  margin-bottom: 20px;
-}
-.carousel img{
-  width: 100%;
-  max-height: 430px;
-  min-height:400px;
-  opacity:0.7;
-}
-.carousel-control {
-  width: 50px;
-}
-.carousel-caption {
-  position: absolute;
-  margin: 5% -10% 5% -10%;
-  max-width: 1200px;
-  max-height: 600px;
-}
-a.carousel-control.left, a.carousel-control.right {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-a.carousel-control.left:focus, a.carousel-control.right:focus {
-    background-color: rgba(0, 0, 0, 0.25);
-    border-style: solid;
-    border-color: black;
-}
 
 .dropdown-toggle:focus {
   outline:dotted;
 }
-.st-default-search-input::-webkit-input-placeholder{
-	color: #000000 !important; 
-}
-.st-default-search-input{
-	color: #000000 !important; 
-}
-.st-default-search-input:focus {
-        border-color: #3a98e3 !important;
-}
+
 @media screen and (-ms-high-contrast: black-on-white) {
   .brand
   {
@@ -87,9 +54,9 @@ a.carousel-control.left:focus, a.carousel-control.right:focus {
     border-bottom-color: transparent;
     cursor: default;
 }
-.nav-pills>li.active>a, .nav-pills>li.active>a:hover, .nav-pills>li.active>a:focus {
+.nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus {
     color: #ffffff;
-    background-color: #d23714;
+    background-color: var(--orange-medium);
 }
 .btn-primary {
     color: #ffffff;
@@ -97,9 +64,9 @@ a.carousel-control.left:focus, a.carousel-control.right:focus {
     border-color: #d23714;
 }
 a {
-  color: #d23000;
-  text-decoration: underline;
-  text-decoration-color:#d23000;
+    color: var(--orange-dark);
+    text-decoration: underline;
+    text-decoration-color: var(--orange-dark);
 }
 a[role=menuitem]{
   text-decoration: none;
@@ -388,6 +355,62 @@ pre {
   }
 }
 
+/* Search Bar*/
+
+.search-bar-input::placeholder {
+    color: #767676;
+}
+
+.search-bar-input {
+    box-shadow: none;
+    border: none;
+    height: 3rem;
+    border-radius: 20px;
+    width: 4rem;
+}
+
+.search-bar.navbar-form {
+    border: none;
+    padding-right: 15px;
+}
+
+.search-bar-input:focus {
+    border-radius: 4px;
+}
+
+/* Typing Animation */
+
+.typewrite {
+    overflow: hidden; /* Ensures the content is not revealed until the animation */
+    border-right: .1em solid var(--orange-icon); /* The typwriter cursor */
+    margin: 0 auto; /* Gives that scrolling effect as the typing happens */
+    animation: typing 3.5s steps(40, end), blink-caret .75s step-end infinite;
+}
+
+@keyframes blink-caret {
+    from, to {
+        border-color: transparent
+    }
+
+    50% {
+        border-color: var(--orange-icon);
+    }
+}
+
+.typing-animation {
+    height: 4rem;
+}
+
+.typing-animation span {
+    font-family: monospace;
+    letter-spacing: .15em;
+    font-size: 2.2rem;
+    font-weight: 300;
+    background-color: var(--orange-paler);
+}
+
+/* Misc */
+
 strong {
   color: #000;
   font-weight: bold;
@@ -421,3 +444,230 @@ td {
     white-space: nowrap;
     width: 1px;
 }
+
+.items-container {
+    display: flex;
+    gap: 2rem;
+    margin-top: 2rem;
+    margin-bottom: 2rem;
+}
+
+.items-container.centered {
+    justify-content: space-between;
+}
+
+.card {
+    padding: 1rem 2rem;
+    box-shadow: 0 .25rem 1rem rgba(0,0,0,.17);
+    background-color: white;
+}
+
+.card:hover {
+    cursor: pointer;
+}
+
+.items-container .card:hover {
+    box-shadow: 0 .25rem 2rem rgba(0,0,0,.27);
+}
+
+.card-column .card:hover {
+    box-shadow: 0 .25rem 1rem rgba(0,0,0,.30);
+}
+
+.card img {
+    object-fit: cover;
+    width: 100%;
+    height: 30rem;
+    padding-top: 1rem;
+    padding-bottom: 1rem;
+}
+
+.big-action {
+    background-color: var(--orange-medium);
+    color: white;
+    text-decoration: none;
+    border: none;
+    font-weight: bold;
+    padding: 0.5rem;
+    border-radius: 7px;
+    padding-left: 4rem;
+    padding-right: 4rem;
+}
+
+a.big-action:hover, a.big-action:focus {
+    color: white;
+    text-decoration: none;
+}
+
+:root {
+    --orange-paler: #FEF8F3;
+    --orange-pale: #FFF4EB;
+    --orange-light1: #FCEFE5;
+    --orange-light: #FFF2E7;
+    --orange-icon: #FF8C00;
+    --orange-bright: rgba(245, 83, 0, 0.96); /**/
+    --orange-medium: #D44300;
+    --orange-medium-focused: #BE3C00;
+    --orange-dark: #BB3B00;
+    --footer-height: 14rem;
+}
+
+div.banner {
+    background-color: var(--orange-light);
+    margin-top: 2rem;
+    margin-bottom: 2rem;
+}
+
+div.banner.upgrade {
+    padding-top: 2rem;
+    padding-bottom: 2rem;
+}
+
+.recent-post-title a {
+    font-weight: 600;
+    color: black;
+    text-decoration: none;
+}
+
+.recent-post-title a:hover, .recent-post-title a:focus, .recent-post-title a:active {
+    text-decoration: underline;
+}
+
+h1, h2, h3 {
+    font-weight: 500;
+}
+
+.banner h3 {
+    color: var(--orange-medium);
+}
+
+div.container-fluid, div.navbar-collapse {
+    padding: 0 !important;
+}
+
+html {
+    position: relative;
+    min-height: 100%;
+}
+
+body {
+    margin-bottom: calc(var(--footer-height) + 4rem);
+}
+
+.footer {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    height: var(--footer-height);
+    width: 100%;
+    overflow: hidden;
+    display: flex;
+    flex-wrap: wrap;
+    align-content: center;
+    background-color: var(--orange-medium);
+    padding: 4rem 0 4rem 0;
+}
+
+.footer p, .footer p a, .footer p strong {
+    color: white !important;
+    text-decoration: none;
+}
+
+.footer p a:hover, .footer p a:focus, .footer p a:active {
+    text-decoration: underline !important;
+}
+
+.card h4 a {
+    color: black;
+    text-decoration: none;
+    font-weight: 400;
+    font-size: .9em;
+}
+
+#tagline h1, #tagline h2 {
+    color: var(--orange-bright);
+    margin-top: 0;
+}
+
+#tagline h1 {
+    font-weight: bold;
+    font-size: 5rem;
+}
+
+#tagline {
+    display: flex;
+    margin: 4rem;
+}
+
+#tagline img {
+    max-width: 17.5rem;
+    padding-right: 2rem;
+    padding-top: 1rem;
+}
+
+#tagline div {
+    max-width: 30rem;
+}
+
+#tagline-container {
+    display: flex;
+    justify-content: center;
+}
+
+div.card-column {
+    display: flex;
+    flex-direction: column;
+    gap: 3rem;
+}
+
+.card-column.main-content .card h2 {
+    font-size: 1.17em;
+    margin: .83em 0;
+    color: black;
+}
+
+.nav-pills > li > a {
+    text-decoration: none;
+}
+
+.navbar {
+    border-radius: 0;
+}
+
+.table-striped > tbody > tr:nth-of-type(odd).featured, .table-striped > tbody > tr:nth-of-type(even).featured {
+    background-color: var(--orange-paler);
+}
+
+.table-striped > tbody > tr:nth-of-type(odd).featured:hover, .table-striped > tbody > tr:nth-of-type(even).featured:hover {
+    background-color: var(--orange-pale);
+}
+
+/*nav {
+    position: fixed;
+    top: 0;
+}*/
+
+
+a.navbar-brand {
+    text-decoration: none;
+}
+
+a.navbar-brand:hover, a.navbar-brand:focus,
+.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus,
+.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus,
+.dropdown-menu li a:hover, .dropdown-menu li a:focus {
+    background-color: var(--orange-medium-focused);
+}
+
+div.icon-link {
+    display: flex;
+}
+
+div.icon-link  svg {
+    margin-right: 0.8rem;
+    margin-top: 0.3rem;
+}
+
+.modal-open .modal-backdrop.fade.in {
+    display: none;
+}
\ No newline at end of file