diff --git a/channels/filmstreaming.py b/channels/filmstreaming.py
index 027c83d0..3511f3ee 100644
--- a/channels/filmstreaming.py
+++ b/channels/filmstreaming.py
@@ -83,6 +83,10 @@ def genres(item):
 
 
 def findvideos(item):
-    url = support.match(item.url, patron='<iframe [^>]+src="([^"]+)').match
-    data = support.match(url).data
-    return support.server(item, data)
+    urls = []
+    data = support.match(item.url).data
+    urls += support.match(data, patron=r'<span data-link="([^"]+)').matches
+    url = support.match(data, patron='<iframe [^>]+src="([^"]+)').match
+    if url:
+        urls.append(support.match(url).data)
+    return support.server(item, urls)
\ No newline at end of file
diff --git a/servers/evoload.json b/servers/evoload.json
index 17d7034b..a716eda0 100644
--- a/servers/evoload.json
+++ b/servers/evoload.json
@@ -4,7 +4,7 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "https?://evoload.io/[ve]/([a-zA-Z0-9]+)",
+        "pattern": "evoload.io/[ve]/([a-zA-Z0-9]+)",
         "url": "https://evoload.io/e/\\1?h=https://evoload.io/v/\\1"
       }
     ]
diff --git a/servers/evoload.py b/servers/evoload.py
index 078f0e57..84ae7791 100644
--- a/servers/evoload.py
+++ b/servers/evoload.py
@@ -11,6 +11,7 @@ from platformcode import logger
 
 def test_video_exists(page_url):
     logger.debug("(page_url='%s')" % page_url)
+    global json
     json = get_json(page_url)
     if not json or ('xstatus' in json and json['xstatus'] == 'del'):
         return False,  config.get_localized_string(70449) % "EvoLoad"
@@ -32,17 +33,12 @@ def get_json(page_url):
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.debug("url=" + page_url)
+    global json
     video_urls = []
 
-    json = get_json(page_url)
-    label = url = ''
-
     if json:
-        if 'name' in json:
-            label = json['name']
-        if 'stream' in json and 'src' in json['stream']:
-            url = json['stream']['src']
-
+        label = json.get('name', '').split('/')[-1]
+        url = json.get('stream', {}).get('src', '')
         if url:
             video_urls.append(['%s [evoload]' % label, url])
     return video_urls
diff --git a/servers/goodstream.json b/servers/goodstream.json
new file mode 100644
index 00000000..08a8c5a6
--- /dev/null
+++ b/servers/goodstream.json
@@ -0,0 +1,25 @@
+{
+  "active": true,
+  "find_videos": {
+    "ignore_urls": [],
+    "patterns": [
+      {
+        "pattern": "goodstream.uno/(?:video/embed/)?([a-zA-Z0-9]+)",
+        "url": "https://goodstream.uno/video/embed/\\1/680x420"
+      }
+    ]
+  },
+  "free": true,
+  "id": "goodstream",
+  "name": "GoodStream",
+  "settings": [
+    {
+      "default": false,
+      "enabled": true,
+      "id": "black_list",
+      "label": "@70708",
+      "type": "bool",
+      "visible": true
+    }
+  ]
+}
diff --git a/servers/goodstream.py b/servers/goodstream.py
new file mode 100644
index 00000000..cf60b6b4
--- /dev/null
+++ b/servers/goodstream.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+from core import httptools
+from core import scrapertools
+from platformcode import config, logger
+
+
+def test_video_exists(page_url):
+    global data
+    page = httptools.downloadpage(page_url)
+    data = page.data
+    if page.code == 404:
+        return False, config.get_localized_string(70449) % "GoodStream"
+    return True, ""
+
+
+def get_video_url(page_url, premium=False, user="", password="", video_password=""):
+    global data
+    logger.debug("(page_url='%s')" % page_url)
+    video_urls = []
+    matches = scrapertools.find_multiple_matches(data, '<source src="([^"]+)" type="video/(\w+)')
+    for media_url, ext in matches:
+        video_urls.append([ext, media_url])
+    return video_urls