diff --git a/datex.ps1 b/datex.ps1
index 9fef4e3..853ab05 100644
--- a/datex.ps1
+++ b/datex.ps1
@@ -1,30 +1,49 @@
+# Used everytime
+$User = "username"
+#$password = Get-Content /home/httpd/sites/datex/cred.txt | ConvertTo-SecureString
+#$credential = New-Object System.Management.Automation.PsCredential($User,$password)
 
-#[xml]$Weather = Get-Content "C:\Users\Morten\Downloads\GetMeasuredWeatherData.xml"
-#[xml]$Weather = Invoke-WebRequest -Credential (Get-Credential) -Uri https://www.vegvesen.no/ws/no/vegvesen/veg/trafikkpublikasjon/vaer/2/GetMeasuredWeatherData
+# Magic
+#[xml]$Weather = Invoke-WebRequest -Credential $credential https://www.vegvesen.no/ws/no/vegvesen/veg/trafikkpublikasjon/vaer/2/GetMeasurementWeatherSiteTable
+
+
+$securepassword = ConvertTo-SecureString "password" -AsPlainText -Force
+$credentials = New-Object System.Management.Automation.PSCredential($User, $securepassword)
+[xml]$Weather = Invoke-WebRequest -Uri "https://www.vegvesen.no/ws/no/vegvesen/veg/trafikkpublikasjon/vaer/2/GetMeasuredWeatherData" -Credential $credentials
 
 
 
+
+#MET
+Invoke-webrequest https://api.met.no/weatherapi/textforecast/2.0/?forecast=landoverview -Outfile "response.xml"
+[xml]$met = New-Object -TypeName xml
+$met.load("response.xml")
+$ostlandet_24 = $met.textforecast.time[0].forecasttype.location[0].innertext | Out-File /home/httpd/sites/datex/met24.inc
+
+$ostlandet_48 = $met.textforecast.time[1].forecasttype.location[0].innertext | Out-File /home/httpd/sites/datex/met48.inc
+# MET SLUTT
+ 
 $EndResult = @()
-#$IDs = "206","207","228","1125","277","95"
-$IDs = "1740","206","174"
-
+$IDs = "206","217","342","1740","73","175","202","142","341","277","210","249","163"
 Foreach ($place in $IDs) {
     $Location = $Weather.d2LogicalModel.payloadPublication.siteMeasurements | Where-Object { $_.measurementsitereference.id -eq $place }
-
+ 
     $LocationAirTemp = ($Location.measuredValue | Where-Object {$_.index -eq "101"}).innertext
     $LocationHumidity = ($Location.measuredValue | Where-Object {$_.index -eq "201"}).innertext + " %"
     $LocationDewPoint = ($Location.measuredValue | Where-Object {$_.index -eq "301"}).innertext
     $LocationRoadTemp = ($Location.measuredValue | Where-Object {$_.index -eq "801"}).innertext
     [float]$LocationWindSpeed = ($Location.measuredValue | Where-Object {$_.index -eq "901"}).innertext
     #$LocationWindDir = ($Location.measuredValue | Where-Object {$_.index -eq "901"}).innertext
-    $LocationVisibility = ($Location.measuredValue | Where-Object {$_.index -eq "1401"}).innertext
+#    $LocationVisibility = ($Location.measuredValue | Where-Object {$_.index -eq "1401"}).innertext
     $LocationPrecipitation = ($Location.measuredValue | Where-Object {$_.index -eq "2501"}).innertext + " mm/h"
-    $LocationSnowDepth = ($Location.measuredValue | Where-Object {$_.index -eq "3301"}).innertext
-
-    if (!$LocationSnowDepth) {$LocationSnowDepth = "-"}
+   # $LocationSnowDepth = ($Location.measuredValue | Where-Object {$_.index -eq "3301"}).innertext
+ 
+    #if (!$LocationSnowDepth) {$LocationSnowDepth = "-"}
     if (!$LocationWindSpeed) {[string]$LocationWindSpeed = "-"} else { $LocationWindSpeed = $LocationWindSpeed*5/18 } # Omregning fra km/t til m/s
     if (!$LocationVisibility) {$LocationVisibility = "-"}
-    $Place = $Place.Replace("206","Lygna").Replace("207","Bekkehallum").Replace("1740","Vingromsåsen").Replace("174","Eina")
+    $Place = $Place.Replace("206","Lygna").Replace("217","Bekkehallum").Replace("342","Vardalsåsen").Replace("1740","Vingromåsen").Replace("73","Eggemoen").Replace("175","Stryken").Replace("202","Brovoll").Replace("142","Gjelleråsen").Replace("341","Tonsåsen").Replace("277","Andelva").Replace("210","Minnesund").Replace("249","Espa").Replace("163","Vikselv")
+
+
     $Resultname = [PSCustomObject][ordered]@{
         Lokasjon = $place
         Lufttemperatur = $LocationAirTemp
@@ -32,33 +51,48 @@ Foreach ($place in $IDs) {
         Veibanetemperatur = $LocationRoadTemp
         Nedbørintensitet = $LocationPrecipitation
         Vindhastighet = $LocationWindSpeed
-        Snødybde = $LocationSnowDepth
+     #   Snødybde = $LocationSnowDepth
         Luftfuktighet = $LocationHumidity
-        Siktrekkevidde = $LocationVisibility
+ #       Siktrekkevidde = $LocationVisibility
         }
         $EndResult += $ResultName
     }
-
-
+ 
+ 
 $EndResult|Format-Table
 $fragments = @()
-
-$fragments+= "<H1>Værstatistikk</H1>"
+$fragments += @'
+ 
+<script>
+   $(document).ready(function(){
+       var refreshUsers = setInterval(function() {
+           $("#Container").load("mestatable.inc");
+       }, 1000); // 300000 ms = 5 min
+   });
+</script>
+<script type="text/javascript">
+setInterval("my_function();",1000);
+function my_function(){
+ $('#refresh').load(location.href + ' #time');
+}
+</script>
+'@
+$fragments+= '<H1><img src="logo-mesta1.png"> Værstatistikk </H1>'
 [xml]$html = $EndResult | convertto-html -Fragment
  
 # Lufttemp
 for ($i=1;$i -le $html.table.tr.count-1;$i++) {
-  if ([float]$html.table.tr[$i].td[1] -lt 0) {
-    $class = $html.CreateAttribute("class")
-    $class.value = 'minus'
-    $html.table.tr[$i].childnodes[1].attributes.append($class) | out-null
-    $html.table.tr[$i].childnodes[1].'#text' = ($html.table.tr[$i].childnodes[1].'#text') + " °C"
+ if ([float]$html.table.tr[$i].td[1] -lt 0) {
+   $class = $html.CreateAttribute("class")
+   $class.value = 'minus'
+   $html.table.tr[$i].childnodes[1].attributes.append($class) | out-null
+   $html.table.tr[$i].childnodes[1].innertext = ($html.table.tr[$i].childnodes[1].innertext) + " °C"
   }
   else {
     $class = $html.CreateAttribute("class")
     $class.value = 'pluss'
     $html.table.tr[$i].childnodes[1].attributes.append($class) | out-null
-    $html.table.tr[$i].childnodes[1].'#text' = ($html.table.tr[$i].childnodes[1].'#text') + " °C"
+    $html.table.tr[$i].childnodes[1].innertext = ($html.table.tr[$i].childnodes[1].innertext) + " °C"
   }
 }
 # Duggpunkt
@@ -67,13 +101,13 @@ for ($i=1;$i -le $html.table.tr.count-1;$i++) {
       $class = $html.CreateAttribute("class")
       $class.value = 'minus'
       $html.table.tr[$i].childnodes[2].attributes.append($class) | out-null
-      $html.table.tr[$i].childnodes[2].'#text' = ($html.table.tr[$i].childnodes[2].'#text') + " °C"
+      $html.table.tr[$i].childnodes[2].InnerText = ($html.table.tr[$i].childnodes[2].'#text') + " °C"
     }
     else {
       $class = $html.CreateAttribute("class")
       $class.value = 'pluss'
       $html.table.tr[$i].childnodes[2].attributes.append($class) | out-null
-      $html.table.tr[$i].childnodes[2].'#text' = ($html.table.tr[$i].childnodes[2].'#text') + " °C"
+      $html.table.tr[$i].childnodes[2].InnerText = ($html.table.tr[$i].childnodes[2].'#text') + " °C"
     }
   }
 # Veibanetemp
@@ -82,93 +116,149 @@ for ($i=1;$i -le $html.table.tr.count-1;$i++) {
       $class = $html.CreateAttribute("class")
       $class.value = 'minus'
       $html.table.tr[$i].childnodes[3].attributes.append($class) | out-null
-      $html.table.tr[$i].childnodes[3].'#text' = ($html.table.tr[$i].childnodes[3].'#text') + " °C"
+      $html.table.tr[$i].childnodes[3].InnerText  = ($html.table.tr[$i].childnodes[3].'#text') + " °C"
     }
     else {
       $class = $html.CreateAttribute("class")
       $class.value = 'pluss'
       $html.table.tr[$i].childnodes[3].attributes.append($class) | out-null
-      $html.table.tr[$i].childnodes[3].'#text' = ($html.table.tr[$i].childnodes[3].'#text') + " °C"
+      $html.table.tr[$i].childnodes[3].InnerText = ($html.table.tr[$i].childnodes[3].'#text') + " °C"
     }
   }
 # Vindhastighet
 for ($i=1;$i -le $html.table.tr.count-1;$i++) {
   if ($html.table.tr[$i].td[5] -ne "-") {
-    $html.table.tr[$i].childnodes[5].'#text' = ($html.table.tr[$i].childnodes[5].'#text') + " m/s"
+    $html.table.tr[$i].childnodes[5].InnerText = ($html.table.tr[$i].childnodes[5].'#text') + " m/s"
   }
 }
 # Snødybde
-for ($i=1;$i -le $html.table.tr.count-1;$i++) {
-  if ($html.table.tr[$i].td[6] -ne "-") {
-    $html.table.tr[$i].childnodes[6].'#text' = ($html.table.tr[$i].childnodes[6].'#text') + " meter"
-  }
-}
+#for ($i=1;$i -le $html.table.tr.count-1;$i++) {
+ # if ($html.table.tr[$i].td[6] -ne "-") {
+  #  $html.table.tr[$i].childnodes[6].'#text' = ($html.table.tr[$i].childnodes[6].'#text') + " meter"
+  #}
+#s}
 # Siktrekkevidde
-for ($i=1;$i -le $html.table.tr.count-1;$i++) {
-  if ($html.table.tr[$i].td[8] -ne "-") {
-    $html.table.tr[$i].childnodes[8].'#text' = ($html.table.tr[$i].childnodes[8].'#text') + " meter"
-  }
-}
+#for ($i=1;$i -le $html.table.tr.count-1;$i++) {
+#  if ($html.table.tr[$i].td[7] -ne "-") {
+#    $html.table.tr[$i].childnodes[7].'#text' = ($html.table.tr[$i].childnodes[7].'#text') + " meter"
+#  }
+#}
+
+
+#:Send-MailMessage -From 'User01 <steinar@engelund.nu>' -To 'User02 <zoyzat@gmail.com>' -Subject 'Test mail' -SmtpServer 'smtp.domeneshop.no'
+
 #$fragments += $html.InnerXml
-$html.InnerXml |Out-File C:\temp\mestatable.inc
+$html.InnerXml | Out-File /home/httpd/sites/datex/mestatable.inc
 $fragments += @'
 <div id="Container">
 <? include 'mestatable.inc'; ?>
 </div>
 <div id="refresh">
-  <div id="time">
-  <p class='footer'>Siste oppdatering: <?php echo date('H:i:s');?></p>
-  </div>
+ <div id="time">
+ <p class='footer'>Siste oppdatering: <?php echo date('H:i:s');?></p>
+ <meta http-equiv="refresh" content="5">
+ </div>
+</div>
+'@
+$fragments +="<h1>Værvarsel fra met.no</h1>
+<b>Østlandet 24 timer:</b><p>$ostlandet_24</p>
+<b>Østlandet 48 timer:</b><p>$ostlandet_48</p></br>"
+$fragments += @'
+ 
+<div class="w3-content w3-section" style="max-width:500px">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=109104" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=452531" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=2152383" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=440787" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=108543" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=750415" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=2056087" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=452497" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=729525" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=659547" style="width="640" Height="480">
+  <img class="mySlides" src="http://185.44.99.133/jpg/image.jpg" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.synnfjellhytteeierforening.no/Images/Webcam/2/webcam2.jpgs" style="width="640" Height="480">
 </div>
 
-<script src="https://cdn.jsdelivr.net/npm/hls.js@canary"></script>
-<video id="video" controls autoplay class="videoCentered"></video>
+
+<div class="w3-content w3-section" style="max-width:500px">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=109104" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=452531" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=2152383" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=440787" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=108543" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=750415" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=2056087" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=452497" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=729525" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.vegvesen.no/public/webkamera/kamera?id=659547" style="width="640" Height="480">
+  <img class="mySlides" src="http://185.44.99.133/jpg/image.jpg" style="width="640" Height="480">
+  <img class="mySlides" src="https://www.synnfjellhytteeierforening.no/Images/Webcam/2/webcam2.jpgs" style="width="640" Height="480">
+
+
+
+</div>
+
+
 <script>
-  var video = document.getElementById('video');
-  if(Hls.isSupported()) {
-    var hls = new Hls();
-    hls.loadSource('https://kamera.vegvesen.no/public/0529008_1/manifest.m3u8');
-    hls.attachMedia(video);
-    hls.on(Hls.Events.MANIFEST_PARSED,function() {
-      video.play();
-  });
- }
+var myIndex = 0;
+carousel();
+
+function carousel() {
+  var i;
+  var x = document.getElementsByClassName("mySlides");
+  for (i = 0; i < x.length; i++) {
+    x[i].style.display = "none";
+  }
+  myIndex++;
+  if (myIndex > x.length) {myIndex = 1}
+  x[myIndex-1].style.display = "block";
+  setTimeout(carousel, 5000); // Change image every 2 seconds
+}
 </script>
+
+</br>
+
+
+<script src="https://www.yr.no/sted/Norge/Oppland/Gran/Lygna/ekstern_boks_time_for_time.js"></script><noscript><a href="https://www.yr.no/sted/Norge/Oppland/Gran/Lygna/">yr.no: Værvarsel for Lygna</a></noscript>
+<script src="https://www.yr.no/sted/Norge/Oppland/Lunner/Stryken/ekstern_boks_time_for_time.js"></script><noscript><a href="https://www.yr.no/sted/Norge/Oppland/Lunner/Stryken/">yr.no: Værvarsel for Stryken</a></noscript>
+<script src="https://www.yr.no/sted/Norge/Oppland/Nordre_Land/Dokka/ekstern_boks_time_for_time.js"></script><noscript><a href="https://www.yr.no/sted/Norge/Oppland/Nordre_Land/Dokka/">yr.no: Værvarsel for Dokka</a></noscript>
 '@
-
-
-$convertParams = @{ 
+ 
+ 
+$convertParams = @{
   head = @"
- <Title>Mesta Værstatistikk</Title>
+<Title>Mesta Værstatistikk - datex.glaeserud.no</Title>
 <style>
 body { background-color:#E5E4E2;
-       font-family:Monospace;
-       font-size:10pt; }
-td, th { border:0px solid black; 
-         border-collapse:collapse;
-         white-space:pre;
-         text-align:center; }
+      font-family:Monospace;
+      font-size:10pt; }
+td, 
+th { border:0px solid black;
+        border-collapse:collapse;
+        white-space:pre;
+        text-align:center; }
 th { color:white;
-     background-color:black; }
+    background-color:black; }
 table, tr, td, th { padding: 2px; margin: 0px ;white-space:pre; }
 tr:nth-child(odd) {background-color: lightgray}
 table { width:500px;margin-left:5px; margin-bottom:20px;}
 h2 {
- font-family:Tahoma;
- color:#6D7B8D;
+font-family:Tahoma;
+color:#6D7B8D;
 }
 .minus {
- color: blue; 
- }
-.pluss {
-    color: red;
+color: blue;
 }
-.footer 
-{ color:green; 
-  margin-left:10px; 
-  font-family:Tahoma;
-  font-size:8pt;
-  font-style:italic;
+.pluss {
+   color: red;
+}
+.footer
+{ color:green;
+ margin-left:10px;
+ font-family:Tahoma;
+ font-size:8pt;
+ font-style:italic;
 }
 </style>
 <meta charset="UTF-8">
@@ -176,21 +266,6 @@ h2 {
 "@
  body = $fragments
 }
-
-convertto-html @convertParams | out-file c:\temp\mesta.php
-
-Write-host -fore Yellow "## Starting FTP upload.."
-$File = "C:\temp\mesta.php";
-$ftp = "ftp://xxxxxxx:yyyyyyy@web.home.zyrex.org//home/httpd/sites/zyrex.org/temp/mesta.php";
-$File2 = "C:\temp\mestatable.inc";
-$ftp2 = "ftp://xxxxxxxx:yyyyyyy@web.home.zyrex.org//home/httpd/sites/zyrex.org/temp/mestatable.inc";
-
-$webclient = New-Object -TypeName System.Net.WebClient;
-$uri = New-Object -TypeName System.Uri -ArgumentList $ftp;
-$uri2 = New-Object -TypeName System.Uri -ArgumentList $ftp2;
-
-
-Write-Host -fore Yellow "## Uploading $File...";
-$webclient.UploadFile($uri, $File);
-Write-Host -fore Yellow "## Uploading $File2...";
-$webclient.UploadFile($uri2, $File2);
+ 
+convertto-html @convertParams | out-file /home/httpd/sites/datex/index7.php
+ 
\ No newline at end of file