diff --git a/app/Helpers/VideoStream.php b/app/Helpers/VideoStream.php
index d3ff36d..e3bb0ec 100644
--- a/app/Helpers/VideoStream.php
+++ b/app/Helpers/VideoStream.php
@@ -6,20 +6,22 @@ namespace App\Helpers;
  * Description of VideoStream
  *
  * @author Rana
+ * modified by HazCod to use stream_get_contents and correct session shutoff
+ * https://github.com/HazCod
  * @link http://codesamplez.com/programming/php-html5-video-streaming-tutorial
  **/
 class VideoStream
 {
-	private $path = '';
-	private $stream = '';
-	private $buffer = 102400;
-	private $start = -1;
-	private $end = -1;
-	private $size = 0;
+	private string $path;
+	private mixed $stream;
+	private int $buffer = 102400;
+	private int $start = -1;
+	private int $end = -1;
+	private int $size = 0;
 
-	function __construct($filePath)
+	function __construct(string $filename)
 	{
-		$this->path = $filePath;
+		$this->path = $filename;
 	}
 
 	/**
@@ -27,9 +29,8 @@ class VideoStream
 	 **/
 	private function open()
 	{
-		if (! ($this->stream = fopen($this->path,'rb')) ) {
+		if (! ($this->stream=fopen($this->path,'rb',false, stream_context_create())))
 			die('Could not open stream for reading');
-		}
 	}
 
 	/**
@@ -38,53 +39,55 @@ class VideoStream
 	private function setHeader()
 	{
 		ob_get_clean();
-		header('Content-Type: video/mp4');
-		header('Cache-Control: max-age=2592000, public');
-		header('Expires: '.gmdate('D, d M Y H:i:s',time()+2592000) . ' GMT');
-		header('Last-Modified: '.gmdate('D, d M Y H:i:s',@filemtime($this->path)) . ' GMT' );
+		header('Content-Type: '.mime_content_type($this->path));
+		header(sprintf('Cache-Control: max-age=%d, public',$x=60*60*24*30));
+		header(sprintf('Expires: %s GMT',gmdate('D, d M Y H:i:s',time()+$x)));
+		header(sprintf('Last-Modified: %s GMT',gmdate('D, d M Y H:i:s',filemtime($this->path))));
+
 		$this->start = 0;
 		$this->size = filesize($this->path);
 		$this->end = $this->size - 1;
 		header('Accept-Ranges: 0-'.$this->end);
 
 		if (isset($_SERVER['HTTP_RANGE'])) {
-
-			$c_start = $this->start;
 			$c_end = $this->end;
 
 			list(,$range) = explode('=',$_SERVER['HTTP_RANGE'],2);
-			if (strpos($range,',') !== false) {
+			if (strpos($range,',') !== FALSE) {
 				header('HTTP/1.1 416 Requested Range Not Satisfiable');
-				header("Content-Range: bytes $this->start-$this->end/$this->size");
+				header(sprintf('Content-Range: bytes %d-%d/%d',$this->start,$this->end,$this->size));
 				exit;
 			}
+
 			if ($range == '-') {
 				$c_start = $this->size - substr($range,1);
-			}else{
+
+			} else {
 				$range = explode('-',$range);
 				$c_start = $range[0];
-
 				$c_end = (isset($range[1]) && is_numeric($range[1])) ? $range[1] : $c_end;
 			}
+
 			$c_end = ($c_end > $this->end) ? $this->end : $c_end;
+
 			if ($c_start > $c_end || $c_start > $this->size - 1 || $c_end >= $this->size) {
 				header('HTTP/1.1 416 Requested Range Not Satisfiable');
-				header("Content-Range: bytes $this->start-$this->end/$this->size");
+				header(sprintf('Content-Range: bytes %d-%d/%d',$this->start,$this->end,$this->size));
 				exit;
 			}
+
 			$this->start = $c_start;
 			$this->end = $c_end;
 			$length = $this->end - $this->start + 1;
+
 			fseek($this->stream,$this->start);
 			header('HTTP/1.1 206 Partial Content');
 			header("Content-Length: ".$length);
-			header("Content-Range: bytes $this->start-$this->end/".$this->size);
-		}
-		else
-		{
+			header(sprintf('Content-Range: bytes %d-%d/%d',$this->start,$this->end,$this->size));
+
+		} else {
 			header("Content-Length: ".$this->size);
 		}
-
 	}
 
 	/**
@@ -103,13 +106,14 @@ class VideoStream
 	{
 		$i = $this->start;
 		set_time_limit(0);
-		while(!feof($this->stream) && $i <= $this->end) {
+		while ((! feof($this->stream)) && ($i <= $this->end) && (connection_aborted() == 0)) {
 			$bytesToRead = $this->buffer;
+
 			if (($i+$bytesToRead) > $this->end) {
 				$bytesToRead = $this->end - $i + 1;
 			}
-			$data = fread($this->stream,$bytesToRead);
-			echo $data;
+
+			echo stream_get_contents($this->stream,$bytesToRead);
 			flush();
 			$i += $bytesToRead;
 		}
@@ -120,9 +124,10 @@ class VideoStream
 	 **/
 	function start()
 	{
+		session_write_close();
 		$this->open();
 		$this->setHeader();
 		$this->stream();
 		$this->end();
 	}
-}
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/VideoController.php b/app/Http/Controllers/VideoController.php
index bd40ccb..0581448 100644
--- a/app/Http/Controllers/VideoController.php
+++ b/app/Http/Controllers/VideoController.php
@@ -50,6 +50,7 @@ class VideoController extends Controller
 	public function view(Video $o)
 	{
 		if ($o->isReadable())
-			(new VideoStream($o->file_path()))->start();
+			(new VideoStream($o->file_name(FALSE)))
+				->start();
 	}
 }
\ No newline at end of file