diff --git a/M3U_IPTV_CatchUp_Downloader/App.config b/M3U_IPTV_CatchUp_Downloader/App.config
index aa1b777..d2272f7 100644
--- a/M3U_IPTV_CatchUp_Downloader/App.config
+++ b/M3U_IPTV_CatchUp_Downloader/App.config
@@ -19,6 +19,12 @@
             <setting name="DownloadPath" serializeAs="String">
                 <value />
             </setting>
+            <setting name="offset_b" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="offset_a" serializeAs="String">
+                <value />
+            </setting>
         </M3U_IPTV_CatchUp_Downloader.My.MySettings>
     </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/M3U_IPTV_CatchUp_Downloader/Form1.Designer.vb b/M3U_IPTV_CatchUp_Downloader/Form1.Designer.vb
index a146f03..83c9c61 100644
--- a/M3U_IPTV_CatchUp_Downloader/Form1.Designer.vb
+++ b/M3U_IPTV_CatchUp_Downloader/Form1.Designer.vb
@@ -32,6 +32,9 @@ Partial Class Form1
         Me.Label3 = New System.Windows.Forms.Label()
         Me.Button_reload = New System.Windows.Forms.Button()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.Button_choose_Download_path = New System.Windows.Forms.Button()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.TextBox_Download_Path = New System.Windows.Forms.TextBox()
         Me.Button_Download = New System.Windows.Forms.Button()
         Me.TextBox_Filter = New System.Windows.Forms.TextBox()
         Me.Label_seeach = New System.Windows.Forms.Label()
@@ -43,10 +46,12 @@ Partial Class Form1
         Me.MenuStrip = New System.Windows.Forms.MenuStrip()
         Me.DonateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.CheckForUpdateOnGitHubToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.TextBox_Download_Path = New System.Windows.Forms.TextBox()
-        Me.Button_choose_Download_path = New System.Windows.Forms.Button()
         Me.FolderBrowserDialog_DownloadPath = New System.Windows.Forms.FolderBrowserDialog()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.TextBox_offset_b = New System.Windows.Forms.TextBox()
+        Me.TextBox_offset_a = New System.Windows.Forms.TextBox()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.Label6 = New System.Windows.Forms.Label()
         Me.GroupBox1.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
         Me.MenuStrip.SuspendLayout()
@@ -71,7 +76,7 @@ Partial Class Form1
         '
         'ProgressBar1
         '
-        Me.ProgressBar1.Location = New System.Drawing.Point(9, 119)
+        Me.ProgressBar1.Location = New System.Drawing.Point(10, 151)
         Me.ProgressBar1.Name = "ProgressBar1"
         Me.ProgressBar1.Size = New System.Drawing.Size(776, 23)
         Me.ProgressBar1.TabIndex = 3
@@ -83,7 +88,7 @@ Partial Class Form1
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label_status.AutoSize = True
         Me.Label_status.BackColor = System.Drawing.Color.Transparent
-        Me.Label_status.Location = New System.Drawing.Point(16, 145)
+        Me.Label_status.Location = New System.Drawing.Point(17, 177)
         Me.Label_status.Name = "Label_status"
         Me.Label_status.Size = New System.Drawing.Size(24, 13)
         Me.Label_status.TabIndex = 4
@@ -130,6 +135,11 @@ Partial Class Form1
         '
         'GroupBox1
         '
+        Me.GroupBox1.Controls.Add(Me.Label6)
+        Me.GroupBox1.Controls.Add(Me.Label5)
+        Me.GroupBox1.Controls.Add(Me.TextBox_offset_a)
+        Me.GroupBox1.Controls.Add(Me.Label4)
+        Me.GroupBox1.Controls.Add(Me.TextBox_offset_b)
         Me.GroupBox1.Controls.Add(Me.Button_choose_Download_path)
         Me.GroupBox1.Controls.Add(Me.Label2)
         Me.GroupBox1.Controls.Add(Me.TextBox_Download_Path)
@@ -143,10 +153,38 @@ Partial Class Form1
         Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Top
         Me.GroupBox1.Location = New System.Drawing.Point(0, 24)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(795, 166)
+        Me.GroupBox1.Size = New System.Drawing.Size(795, 196)
         Me.GroupBox1.TabIndex = 3
         Me.GroupBox1.TabStop = False
         '
+        'Button_choose_Download_path
+        '
+        Me.Button_choose_Download_path.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.25!)
+        Me.Button_choose_Download_path.Location = New System.Drawing.Point(693, 87)
+        Me.Button_choose_Download_path.Name = "Button_choose_Download_path"
+        Me.Button_choose_Download_path.Size = New System.Drawing.Size(90, 26)
+        Me.Button_choose_Download_path.TabIndex = 12
+        Me.Button_choose_Download_path.Text = "choose"
+        Me.Button_choose_Download_path.UseVisualStyleBackColor = True
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label2.Location = New System.Drawing.Point(15, 90)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(121, 20)
+        Me.Label2.TabIndex = 11
+        Me.Label2.Text = "Download Path:"
+        '
+        'TextBox_Download_Path
+        '
+        Me.TextBox_Download_Path.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.25!)
+        Me.TextBox_Download_Path.Location = New System.Drawing.Point(142, 87)
+        Me.TextBox_Download_Path.Name = "TextBox_Download_Path"
+        Me.TextBox_Download_Path.Size = New System.Drawing.Size(545, 26)
+        Me.TextBox_Download_Path.TabIndex = 10
+        '
         'Button_Download
         '
         Me.Button_Download.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.25!)
@@ -229,7 +267,7 @@ Partial Class Form1
         Me.GroupBox2.Controls.Add(Me.TextBox_Filter)
         Me.GroupBox2.Controls.Add(Me.Button_Download)
         Me.GroupBox2.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox2.Location = New System.Drawing.Point(0, 190)
+        Me.GroupBox2.Location = New System.Drawing.Point(0, 220)
         Me.GroupBox2.Name = "GroupBox2"
         Me.GroupBox2.Size = New System.Drawing.Size(795, 631)
         Me.GroupBox2.TabIndex = 4
@@ -256,47 +294,65 @@ Partial Class Form1
         Me.CheckForUpdateOnGitHubToolStripMenuItem.Size = New System.Drawing.Size(169, 20)
         Me.CheckForUpdateOnGitHubToolStripMenuItem.Text = "Check for Update on GitHub"
         '
-        'Label2
+        'Label4
         '
-        Me.Label2.AutoSize = True
-        Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label2.Location = New System.Drawing.Point(15, 90)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(121, 20)
-        Me.Label2.TabIndex = 11
-        Me.Label2.Text = "Download Path:"
+        Me.Label4.AutoSize = True
+        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label4.Location = New System.Drawing.Point(15, 122)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(57, 20)
+        Me.Label4.TabIndex = 14
+        Me.Label4.Text = "Offset:"
         '
-        'TextBox_Download_Path
+        'TextBox_offset_b
         '
-        Me.TextBox_Download_Path.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.25!)
-        Me.TextBox_Download_Path.Location = New System.Drawing.Point(142, 87)
-        Me.TextBox_Download_Path.Name = "TextBox_Download_Path"
-        Me.TextBox_Download_Path.Size = New System.Drawing.Size(545, 26)
-        Me.TextBox_Download_Path.TabIndex = 10
+        Me.TextBox_offset_b.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.25!)
+        Me.TextBox_offset_b.Location = New System.Drawing.Point(203, 119)
+        Me.TextBox_offset_b.Name = "TextBox_offset_b"
+        Me.TextBox_offset_b.Size = New System.Drawing.Size(37, 26)
+        Me.TextBox_offset_b.TabIndex = 13
         '
-        'Button_choose_Download_path
+        'TextBox_offset_a
         '
-        Me.Button_choose_Download_path.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.25!)
-        Me.Button_choose_Download_path.Location = New System.Drawing.Point(693, 87)
-        Me.Button_choose_Download_path.Name = "Button_choose_Download_path"
-        Me.Button_choose_Download_path.Size = New System.Drawing.Size(90, 26)
-        Me.Button_choose_Download_path.TabIndex = 12
-        Me.Button_choose_Download_path.Text = "choose"
-        Me.Button_choose_Download_path.UseVisualStyleBackColor = True
+        Me.TextBox_offset_a.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.25!)
+        Me.TextBox_offset_a.Location = New System.Drawing.Point(298, 119)
+        Me.TextBox_offset_a.Name = "TextBox_offset_a"
+        Me.TextBox_offset_a.Size = New System.Drawing.Size(37, 26)
+        Me.TextBox_offset_a.TabIndex = 15
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label5.Location = New System.Drawing.Point(138, 122)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(59, 20)
+        Me.Label5.TabIndex = 16
+        Me.Label5.Text = "before:"
+        '
+        'Label6
+        '
+        Me.Label6.AutoSize = True
+        Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label6.Location = New System.Drawing.Point(246, 122)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(46, 20)
+        Me.Label6.TabIndex = 17
+        Me.Label6.Text = "after:"
         '
         'Form1
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(795, 821)
+        Me.ClientSize = New System.Drawing.Size(795, 851)
         Me.Controls.Add(Me.ListBox_Backup)
         Me.Controls.Add(Me.GroupBox2)
         Me.Controls.Add(Me.GroupBox1)
         Me.Controls.Add(Me.MenuStrip)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.MaximumSize = New System.Drawing.Size(811, 860)
-        Me.MinimumSize = New System.Drawing.Size(811, 860)
+        Me.MaximumSize = New System.Drawing.Size(811, 890)
+        Me.MinimumSize = New System.Drawing.Size(811, 890)
         Me.Name = "Form1"
         Me.Text = "M3U IPTV CatchUp Downloader ©TimTester"
         Me.GroupBox1.ResumeLayout(False)
@@ -333,4 +389,9 @@ Partial Class Form1
     Friend WithEvents TextBox_Download_Path As TextBox
     Friend WithEvents Button_choose_Download_path As Button
     Friend WithEvents FolderBrowserDialog_DownloadPath As FolderBrowserDialog
+    Friend WithEvents Label4 As Label
+    Friend WithEvents TextBox_offset_b As TextBox
+    Friend WithEvents Label6 As Label
+    Friend WithEvents Label5 As Label
+    Friend WithEvents TextBox_offset_a As TextBox
 End Class
diff --git a/M3U_IPTV_CatchUp_Downloader/Form1.vb b/M3U_IPTV_CatchUp_Downloader/Form1.vb
index 4256743..0f94323 100644
--- a/M3U_IPTV_CatchUp_Downloader/Form1.vb
+++ b/M3U_IPTV_CatchUp_Downloader/Form1.vb
@@ -1,6 +1,6 @@
 Imports System.IO
 Imports System.Net
-
+Imports System.Text.RegularExpressions
 
 Public Class Form1
 
@@ -38,12 +38,16 @@ Public Class Form1
         My.Settings.EPG_URL = TextBox_EPG_URL.Text
         My.Settings.M3U_URL = TextBox_M3U_URL.Text
         My.Settings.DownloadPath = TextBox_Download_Path.Text
+        My.Settings.offset_a = TextBox_offset_a.Text
+        My.Settings.offset_b = TextBox_offset_b.Text
         My.Settings.Save()
     End Sub
     Private Sub load_settings()
         Dim M3U_URL As String = My.Settings.M3U_URL
         Dim EPG_URL As String = My.Settings.EPG_URL
         Dim DownloadPath As String = My.Settings.DownloadPath
+        Dim offset_a As String = My.Settings.offset_a
+        Dim offset_b As String = My.Settings.offset_b
         TextBox_EPG_URL.Text = EPG_URL
         TextBox_M3U_URL.Text = M3U_URL
 
@@ -53,6 +57,18 @@ Public Class Form1
             TextBox_Download_Path.Text = DownloadPath
         End If
 
+        If offset_a = "" Then
+            TextBox_offset_a.Text = 2
+        Else
+            TextBox_offset_a.Text = offset_a
+        End If
+        If offset_b = "" Then
+            TextBox_offset_b.Text = 2
+        Else
+            TextBox_offset_b.Text = offset_b
+        End If
+
+
 
 
         M3U_URL_Download(TextBox_M3U_URL.Text)
@@ -304,13 +320,16 @@ Public Class Form1
         Dim base_URL As String = ""
         get_User_PW_Channel(channel_Nr, base_URL, USER, PW, URL)
 
+        Dim offset_a As Integer = TextBox_offset_a.Text
+        Dim offset_b As Integer = TextBox_offset_b.Text
+
         'EPG Data
         Dim start_time As DateTime = startTime(ListBox.SelectedIndex)
-        start_time = start_time.AddMinutes(-2) ' start x minutes before
+        start_time = start_time.AddMinutes(offset_b * -1) ' start x minutes before
         Dim stop_time As DateTime = stopTime(ListBox.SelectedIndex)
         title = Titles(ListBox.SelectedIndex)
         Dim elapsedTime As TimeSpan = DateTime.Parse(stop_time).Subtract(start_time)
-        Dim elapsedTime_min As Integer = elapsedTime.TotalMinutes + 2 '  x minutes after
+        Dim elapsedTime_min As Integer = elapsedTime.TotalMinutes + offset_b '  x minutes after
         start_time_str = start_time.ToString("yyyy-MM-dd:HH-mm")
         'CatchUp URL
         Dim timeshift_URL As String = base_URL & "/streaming/timeshift.php?username=" & USER & "&password=" & PW & "&stream=" & channel_Nr & "&start=" & start_time_str & "&duration=" & elapsedTime_min
@@ -446,4 +465,14 @@ Public Class Form1
         Dim DownloadPath As String = FolderBrowserDialog_DownloadPath.SelectedPath
         TextBox_Download_Path.Text = DownloadPath
     End Sub
+
+    Private Sub TextBox_offset_b_TextChanged(sender As Object, e As EventArgs) Handles TextBox_offset_b.TextChanged
+        Dim digitsOnly As Regex = New Regex("[^\d]")
+        TextBox_offset_b.Text = digitsOnly.Replace(TextBox_offset_b.Text, "")
+    End Sub
+
+    Private Sub TextBox_offset_a_TextChanged(sender As Object, e As EventArgs) Handles TextBox_offset_a.TextChanged
+        Dim digitsOnly As Regex = New Regex("[^\d]")
+        TextBox_offset_a.Text = digitsOnly.Replace(TextBox_offset_a.Text, "")
+    End Sub
 End Class
diff --git a/M3U_IPTV_CatchUp_Downloader/My Project/Settings.Designer.vb b/M3U_IPTV_CatchUp_Downloader/My Project/Settings.Designer.vb
index 2f0e383..d43c0e9 100644
--- a/M3U_IPTV_CatchUp_Downloader/My Project/Settings.Designer.vb	
+++ b/M3U_IPTV_CatchUp_Downloader/My Project/Settings.Designer.vb	
@@ -89,6 +89,30 @@ Namespace My
                 Me("DownloadPath") = value
             End Set
         End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("")>  _
+        Public Property offset_b() As String
+            Get
+                Return CType(Me("offset_b"),String)
+            End Get
+            Set
+                Me("offset_b") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("")>  _
+        Public Property offset_a() As String
+            Get
+                Return CType(Me("offset_a"),String)
+            End Get
+            Set
+                Me("offset_a") = value
+            End Set
+        End Property
     End Class
 End Namespace
 
diff --git a/M3U_IPTV_CatchUp_Downloader/My Project/Settings.settings b/M3U_IPTV_CatchUp_Downloader/My Project/Settings.settings
index 7123936..c458169 100644
--- a/M3U_IPTV_CatchUp_Downloader/My Project/Settings.settings	
+++ b/M3U_IPTV_CatchUp_Downloader/My Project/Settings.settings	
@@ -11,5 +11,11 @@
     <Setting Name="DownloadPath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="offset_b" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="offset_a" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file