diff --git a/application/controllers/Contestcalendar.php b/application/controllers/Contestcalendar.php
index e61a67f45..d0afc7cf4 100644
--- a/application/controllers/Contestcalendar.php
+++ b/application/controllers/Contestcalendar.php
@@ -8,13 +8,8 @@ class Contestcalendar extends CI_Controller {
 
 		$data['page_title'] = "Contest Calendar";
 
-		$this->load->driver('cache', array('adapter' => 'file', 'backup' => 'file'));
-		$rssUrl = 'https://www.contestcalendar.com/calendar.rss';
-		if (!$rssRawData = $this->cache->get('RssRawContestCal')) {
-			$rssRawData = file_get_contents($rssUrl, true);
-			$this->cache->save('RssRawContestCal', $rssRawData, (60*60*12));
-		}
-		$data['rss'] = simplexml_load_string($rssRawData, null, LIBXML_NOCDATA);
+		$rssRawData = $this->getRssData();
+		$data['rss'] = $this->parseRSS($rssRawData);
 
 		$footerData['scripts'] = [
 			'assets/js/sections/dxcalendar.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/dxcalendar.js"))
@@ -26,5 +21,96 @@ class Contestcalendar extends CI_Controller {
 
 	}
 
+	private function parseRSS($rssRawData) {
+		$rssData = array();
+	
+		$raw = simplexml_load_string($rssRawData, null, LIBXML_NOCDATA);
+	
+		foreach ($raw->channel->item as $item) {
 
+			// create an array to hold the contest information
+			$contest = array();
+	
+			// write the contest_title to the array
+			$contest['title'] = (string) $item->title;
+	
+			// write the start time to the array. the whole time range is in the 'description' tag of the rssRawData
+			$description = (string) $item->description;
+			$timeRange = $this->parseTimeRange($description);
+			$contest['start'] = $timeRange['start']->format('Y-m-d H:i:s');
+			$contest['end'] = $timeRange['end']->format('Y-m-d H:i:s');
+	
+			// and write the link to the array
+			$contest['link'] = (string) $item->link;
+	
+			// append the contest array to the $rssData array
+			$rssData[] = $contest;
+		}
+	
+		return $rssData;
+	}
+	
+
+	private function parseTimeRange($string) {
+		$timeData = array();
+	
+		// if the timeRange is over midnight the string contains 'to'
+		if (strpos($string, 'to')) {
+	
+			// split in start and end time
+			$parts = explode('to', $string);
+			$start = trim($parts[0]);
+			$end = trim($parts[1]);
+	
+			// create proper dateTime 
+			$timeData['start'] = DateTime::createFromFormat('Hi\Z, M d', $start);
+			$timeData['end'] = DateTime::createFromFormat('Hi\Z, M d', $end);
+		} else {
+	
+			// split in start and end time
+			$parts = explode('-', $string);
+			$start = trim($parts[0]);
+			$end = trim($parts[1]);
+	
+			// extract the date. we need to add this to the start time
+			$date = substr($parts[1], strpos($parts[1], ',') + 2);
+	
+			// create proper dateTime 
+			$timeData['start'] = DateTime::createFromFormat('Hi\Z, M d', $start . ', ' . $date);
+			$timeData['end'] = DateTime::createFromFormat('Hi\Z, M d', $end);
+		}
+	
+		return $timeData;
+	}
+
+	private function getRssData() {
+
+		$this->load->driver('cache', array('adapter' => 'file', 'backup' => 'file'));
+	
+		if (!$rssRawData = $this->cache->get('RssRawContestCal')) {
+		
+			$rssUrl = 'https://www.contestcalendar.com/calendar.rss';
+			
+			$ch = curl_init();
+			curl_setopt($ch, CURLOPT_URL, $rssUrl);
+			curl_setopt($ch, CURLOPT_HEADER, false);
+			curl_setopt($ch, CURLOPT_USERAGENT, 'Wavelog Updater');
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+			$rssRawData = curl_exec($ch);
+			curl_close($ch);
+
+			if ($rssRawData === FALSE) {
+				$msg = "Something went wrong with fetching the Contest Data";
+				log_message('error', $msg);
+				return;
+			}
+	
+			$this->cache->save('RssRawContestCal', $rssRawData, (60*60*12)); // 12 hours cache time
+	
+			curl_close($ch);
+		}
+	
+		return $rssRawData;
+	}
+		
 }
diff --git a/application/views/contestcalendar/index.php b/application/views/contestcalendar/index.php
index 15aa7df8a..b06113df2 100644
--- a/application/views/contestcalendar/index.php
+++ b/application/views/contestcalendar/index.php
@@ -3,30 +3,26 @@
 	<h2><?php echo $page_title; ?></h2>
 	<p>This data is from <a target="_blank" href="https://www.contestcalendar.com/">https://www.contestcalendar.com/</a></p>
 
-		<table style="width:100%" class="table-sm table table-bordered table-hover table-striped table-condensed dxcalendar">
-			<thead>
-				<tr>
-					<th>Contest</th>
-					<th>Date</th>
-					<th>Link</th>
-				</tr>
-			</thead>
-			<tbody>
+	<table style="width:100%" class="table-sm table table-bordered table-hover table-striped table-condensed dxcalendar">
+		<thead>
+			<tr>
+				<th>Contest</th>
+				<th>Start</th>
+				<th>End</th>
+				<th>Link</th>
+			</tr>
+		</thead>
+		<tbody>
 			<?php
-		foreach($rss->channel->item as $item) {
-			echo '<tr>';
-			$title = (string) $item->title;
-			$link = (string) $item->link;
-			$description = (string) $item->description;
-
-			echo "<td>$title</td>";
-			echo "<td>$description</td>";
-			echo "<td><a href='$link' target=_blank>$link</a></td>";
-
-			echo '</tr>';
-		}
-		?>
+			foreach ($rss as $contest) {
+				echo '<tr>';
+				echo "<td>" . $contest['title'] . "</td>";
+				echo "<td>" . $contest['start'] . "</td>";
+				echo "<td>" . $contest['end'] . "</td>";
+				echo "<td><a href='" . $contest['link'] . "' target=_blank>" . $contest['link'] . "</a></td>";
+				echo '</tr>';
+			}
+			?>
 		</tbody>
 	</table>
-
-</div>
+</div>
\ No newline at end of file