diff --git a/images/Context diagram.png b/images/Context diagram.png
index 0a239fa..2186832 100644
Binary files a/images/Context diagram.png and b/images/Context diagram.png differ
diff --git a/index.html b/index.html
index f366f17..9ec6d3a 100644
--- a/index.html
+++ b/index.html
@@ -455,7 +455,6 @@ <h1><span class="image"><img src="./images/arc42-logo.png" alt="arc42"></span> T
 <li><a href="#section-system-scope-and-context">3. System Scope and Context</a>
 <ul class="sectlevel2">
 <li><a href="#_business_context">3.1. Business Context</a></li>
-<li><a href="#_technical_context">3.2. Technical Context</a></li>
 </ul>
 </li>
 <li><a href="#section-solution-strategy">4. Solution Strategy</a></li>
@@ -800,41 +799,51 @@ <h3 id="_business_context">3.1. Business Context</h3>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="./images/Context%20diagram.png" alt="Context diagram" width="461" height="352">
+<img src="./images/Context%20diagram.png" alt="Context diagram" width="504" height="352">
 </div>
 </div>
-<div class="paragraph">
-<p><strong>&lt;optionally: Explanation of external domain interfaces&gt;</strong></p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_technical_context">3.2. Technical Context</h3>
-<div class="sidebarblock arc42help">
-<div class="content">
-<div class="paragraph">
-<div class="title">Contents</div>
-<p>Technical interfaces (channels and transmission media) linking your system to its environment. In addition a mapping of domain specific input/output to the channels, i.e. an explanation which I/O uses which channel.</p>
-</div>
-<div class="paragraph">
-<div class="title">Motivation</div>
-<p>Many stakeholders make architectural decision based on the technical interfaces between the system and its context. Especially infrastructure or hardware designers decide these technical interfaces.</p>
-</div>
-<div class="paragraph">
-<div class="title">Form</div>
-<p>E.g. UML deployment diagram describing channels to neighboring systems,
-together with a mapping table showing the relationships between channels and input/output.</p>
-</div>
-</div>
-</div>
-<div class="paragraph">
-<p><strong>&lt;Diagram or Table&gt;</strong></p>
-</div>
-<div class="paragraph">
-<p><strong>&lt;optionally: Explanation of technical interfaces&gt;</strong></p>
-</div>
-<div class="paragraph">
-<p><strong>&lt;Mapping Input/Output to Channels&gt;</strong></p>
-</div>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 33.3333%;">
+<col style="width: 66.6667%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Element</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><em>Player</em></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><em>Plays the game and can consult past scores</em></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><em>Client</em></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><em>Can access the data about players and generated questions</em></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><em>WIQ Game</em></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><em>Main system in which generated questions are shown and can be answered by players</em></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><em>Wikidata</em></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><em>External data repository from which questions are generated using the WikidataAPI</em></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><em>MongoDB</em></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><em>Database for storing generated questions, players' info and scores</em></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><em>Users Info API</em></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><em>Allows clients to see the info about players stored in the database</em></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><em>Generated Questions API</em></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><em>Allows clients to see the info about generated questions stored in the database</em></p></td>
+</tr>
+</tbody>
+</table>
 <div style="page-break-after: always;"></div>
 </div>
 </div>