diff --git a/AIS/bsmd.AIS2Service/AISController.cs b/AIS/bsmd.AIS2Service/AISController.cs
index f529e4f1..5b13fe87 100644
--- a/AIS/bsmd.AIS2Service/AISController.cs
+++ b/AIS/bsmd.AIS2Service/AISController.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Web.Http;
+using System.Web.Http.Cors;
 
 namespace bsmd.AIS2Service
 {
+    
     public class AISController : ApiController
     {
         [HttpGet]
diff --git a/AIS/bsmd.AIS2Service/App.config b/AIS/bsmd.AIS2Service/App.config
index ebffd0bc..4018ac42 100644
--- a/AIS/bsmd.AIS2Service/App.config
+++ b/AIS/bsmd.AIS2Service/App.config
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
             <section name="bsmd.AIS2Service.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
         </sectionGroup>
-		<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,Log4net"/>
+		<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,Log4net" />
     </configSections>
 	<log4net>
 		<root>
-			<level value="ALL"/>
-			<appender-ref ref="LogFileAppender"/>
-			<appender-ref ref="TraceAppender"/>
+			<level value="ALL" />
+			<appender-ref ref="LogFileAppender" />
+			<appender-ref ref="TraceAppender" />
 		</root>
 		<appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-			<param name="File" value="E:\temp\AIS2Service.log"/>
-			<param name="AppendToFile" value="true"/>
-			<rollingStyle value="Size"/>
-			<maxSizeRollBackups value="10"/>
-			<maximumFileSize value="10MB"/>
-			<staticLogFileName value="true"/>
+			<param name="File" value="E:\temp\AIS2Service.log" />
+			<param name="AppendToFile" value="true" />
+			<rollingStyle value="Size" />
+			<maxSizeRollBackups value="10" />
+			<maximumFileSize value="10MB" />
+			<staticLogFileName value="true" />
 			<layout type="log4net.Layout.PatternLayout">
-				<param name="ConversionPattern" value="%date [%thread] %-5level [%logger] - %message%newline"/>
+				<param name="ConversionPattern" value="%date [%thread] %-5level [%logger] - %message%newline" />
 			</layout>
 		</appender>
 		<appender name="TraceAppender" type="log4net.Appender.TraceAppender">
 			<layout type="log4net.Layout.PatternLayout">
-				<conversionPattern value="%d [%t] %-5p %c %m%n"/>
+				<conversionPattern value="%d [%t] %-5p %c %m%n" />
 			</layout>
 		</appender>
 	</log4net>
@@ -63,4 +63,16 @@
             </setting>
         </bsmd.AIS2Service.Properties.Settings>
     </applicationSettings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
\ No newline at end of file
diff --git a/AIS/bsmd.AIS2Service/Program.cs b/AIS/bsmd.AIS2Service/Program.cs
index 33bbc1ac..a6b67bd8 100644
--- a/AIS/bsmd.AIS2Service/Program.cs
+++ b/AIS/bsmd.AIS2Service/Program.cs
@@ -17,7 +17,7 @@ namespace bsmd.AIS2Service
             {
                 AISManager.Start();
                 // TODO wait some
-                Thread.Sleep(120000);
+                Thread.Sleep(720000);
                 // Test finish..
                 AISManager.Stop();
             }
diff --git a/AIS/bsmd.AIS2Service/StartupWebAPI.cs b/AIS/bsmd.AIS2Service/StartupWebAPI.cs
index 5341523d..b2d1ac0d 100644
--- a/AIS/bsmd.AIS2Service/StartupWebAPI.cs
+++ b/AIS/bsmd.AIS2Service/StartupWebAPI.cs
@@ -1,4 +1,5 @@
 using System.Web.Http;
+using System.Web.Http.Cors;
 using Owin;
 
 namespace bsmd.AIS2Service
@@ -8,12 +9,16 @@ namespace bsmd.AIS2Service
         public void Configuration(IAppBuilder appBuilder)
         {
             HttpConfiguration config = new HttpConfiguration();
+            var cors = new EnableCorsAttribute("*", "*", "*");
+
             config.Routes.MapHttpRoute(
                 name: "AISList",
                 routeTemplate: "api/{Controller}",
                 defaults: new { id = RouteParameter.Optional, Controller = "AIS"}
                 );
+            config.EnableCors(cors);
             appBuilder.UseWebApi(config);
+            
         }
     }
 }
diff --git a/AIS/bsmd.AIS2Service/bsmd.AIS2Service.csproj b/AIS/bsmd.AIS2Service/bsmd.AIS2Service.csproj
index ec6f5bdf..df15c6ff 100644
--- a/AIS/bsmd.AIS2Service/bsmd.AIS2Service.csproj
+++ b/AIS/bsmd.AIS2Service/bsmd.AIS2Service.csproj
@@ -38,17 +38,17 @@
     <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Owin.2.0.2\lib\net45\Microsoft.Owin.dll</HintPath>
+    <Reference Include="Microsoft.Owin, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Owin.4.2.2\lib\net45\Microsoft.Owin.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Owin.Host.HttpListener.2.0.2\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Owin.Host.HttpListener.4.2.2\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin.Hosting, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Owin.Hosting.2.0.2\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Hosting, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Owin.Hosting.4.2.2\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
@@ -63,9 +63,15 @@
       <HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.Cors, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.AspNet.Cors.5.2.9\lib\net45\System.Web.Cors.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web.Http, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebApi.Core.5.2.9\lib\net45\System.Web.Http.dll</HintPath>
     </Reference>
+    <Reference Include="System.Web.Http.Cors, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.AspNet.WebApi.Cors.5.2.9\lib\net45\System.Web.Http.Cors.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web.Http.Owin, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebApi.Owin.5.2.9\lib\net45\System.Web.Http.Owin.dll</HintPath>
     </Reference>
@@ -124,7 +130,9 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="index.html" />
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="AIS2_Service.resx">
       <DependentUpon>AIS2_Service.cs</DependentUpon>
diff --git a/AIS/bsmd.AIS2Service/index.html b/AIS/bsmd.AIS2Service/index.html
new file mode 100644
index 00000000..75abb240
--- /dev/null
+++ b/AIS/bsmd.AIS2Service/index.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>JSON Test</title>
+    <script type="text/javascript" src="update.js"></script>
+</head>
+<body onload="startup()">    
+    <table id="aisTable">
+        <thead>
+            <tr>
+                <th>MMSI</th>
+                <th>Name</th>
+                <th>Timestamp</th>
+                <th>Latitude</th>
+                <th>Longitude</th>
+                <th>IMO</th>
+            </tr>
+        </thead>
+        <tbody id="aisTableBody">
+
+        </tbody>
+    </table>
+</body>
+</html>
\ No newline at end of file
diff --git a/AIS/bsmd.AIS2Service/packages.config b/AIS/bsmd.AIS2Service/packages.config
index 8edf1530..c1bc6dff 100644
--- a/AIS/bsmd.AIS2Service/packages.config
+++ b/AIS/bsmd.AIS2Service/packages.config
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="2.0.15" targetFramework="net48" />
+  <package id="Microsoft.AspNet.Cors" version="5.2.9" targetFramework="net48" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.9" targetFramework="net48" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.9" targetFramework="net48" />
+  <package id="Microsoft.AspNet.WebApi.Cors" version="5.2.9" targetFramework="net48" />
   <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.9" targetFramework="net48" />
   <package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.9" targetFramework="net48" />
-  <package id="Microsoft.Owin" version="2.0.2" targetFramework="net48" />
-  <package id="Microsoft.Owin.Host.HttpListener" version="2.0.2" targetFramework="net48" />
-  <package id="Microsoft.Owin.Hosting" version="2.0.2" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net48" />
+  <package id="Microsoft.Owin" version="4.2.2" targetFramework="net48" />
+  <package id="Microsoft.Owin.Host.HttpListener" version="4.2.2" targetFramework="net48" />
+  <package id="Microsoft.Owin.Hosting" version="4.2.2" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
   <package id="Owin" version="1.0" targetFramework="net48" />
   <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.116.0" targetFramework="net48" />
   <package id="System.Data.SQLite.Core" version="1.0.116.0" targetFramework="net48" />
diff --git a/AIS/bsmd.AIS2Service/update.js b/AIS/bsmd.AIS2Service/update.js
new file mode 100644
index 00000000..817d09ba
--- /dev/null
+++ b/AIS/bsmd.AIS2Service/update.js
@@ -0,0 +1,41 @@
+function update() {
+    fetch('http://localhost:9050/api/ais')
+        .then(function (response) {
+            return response.json();
+        })
+        .then(function (data) {
+            updateData(data);
+        })
+        .catch(function (err) {
+            console.log('error: ' + err);
+        });
+    function updateData(data) {
+        var table = document.getElementById("aisTable");
+
+        const table = document.getElementById('Table');
+        let numItems = 1;
+        
+            numItems++;
+            const row = document.createElement('tr');
+            row.innerHTML = `
+  <td>
+  <input type="text" id="itemDescription${numItems}" placeholder="Item" />
+  </td>
+  <td>
+  <input type="text" id="itemValue${numItems}" placeholder="Value" />
+  </td>`;
+            // You could also do the same for the cells and inputs
+            table.appendChild(row);
+        
+
+        for (var i = 0; i < data.length; i++) {
+            var div = document.createElement("div");
+            div.innerHTML = 'Name: ' + data[i].Name;
+            mainContainer.appendChild(div);
+        }
+    }
+}
+
+function startup() {
+    setInterval(function () { update(); }, 10000);
+}
\ No newline at end of file