diff --git a/events.html b/events.html
index 8d516bf..7f13f69 100644
--- a/events.html
+++ b/events.html
@@ -4,11 +4,19 @@ layout: default
 description: Kalender för händelser på Kulturföreningen Momangen
 image: /uploads/stickerwall.jpg
 ---
+
+
+{% for event in site.events %}
+    {% capture now -%}{{ site.time | date: '%s' }}{%- endcapture %}
+    {% capture endtime -%} {{ event.event_data.end_datetime | date: '%s' }} {%- endcapture %}
+    {% capture postdate -%} {{ event.date | date: '%s' }} {%- endcapture %}
+    {% if now <= endtime %} {% unless now <= postdate %}
 <div class="column" style="border: none;">
   <h3>Kommande event</h3>
   <div class="flexitem" style="margin-left: 0;">
-    {% capture now -%}{{ site.time | date: '%s' }}{%- endcapture %}
+
     {% for event in site.events %}
+    {% capture now -%}{{ site.time | date: '%s' }}{%- endcapture %}
     {% capture endtime -%} {{ event.event_data.end_datetime | date: '%s' }} {%- endcapture %}
     {% capture postdate -%} {{ event.date | date: '%s' }} {%- endcapture %}
     {% if now <= endtime %} {% unless now <= postdate %}
@@ -34,6 +42,7 @@ image: /uploads/stickerwall.jpg
     </div>{% endunless %}{% endif %} {% endfor %} 
   </div>
 </div>
+{% endunless %}{% endif %} {% endfor %} 
 <div class="column" style="border: none;">
   <h3>Förflutna events</h3>
   <div class="flexitem">