diff --git a/06/06-1.py b/06/06-1.py
new file mode 100644
index 0000000..84286a4
--- /dev/null
+++ b/06/06-1.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+times = []
+dists = []
+
+input_file = open("input", "r")
+for line in input_file:
+    if line.startswith('Time:'):
+        times = line.strip().split(":")[1].split()
+    if line.startswith('Distance:'):
+        dists = line.strip().split(":")[1].split()
+input_file.close()
+
+winning_trys = []
+for i in range(len(times)):
+    wins = 0
+    for j in range(int(times[i])+1):
+        if (int(times[i])-j)*j > int(dists[i]):
+            wins += 1
+    winning_trys.append(wins)
+
+print(winning_trys)
+solution = 1
+for j in winning_trys:
+    solution *= j
+
+print(solution)
\ No newline at end of file
diff --git a/06/06-2.py b/06/06-2.py
new file mode 100644
index 0000000..b726e19
--- /dev/null
+++ b/06/06-2.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+tim, dis = 0, 0
+
+input_file = open("input", "r")
+for line in input_file:
+    if line.startswith('T'):
+        tim = int(line.strip().split(":")[1].replace(" ", ""))
+    if line.startswith('D'):
+        dis = int(line.strip().split(":")[1].replace(" ", ""))
+input_file.close()
+
+wins = 0
+for j in range(tim + 1):
+    if (tim-j) * j > dis:
+        wins += 1
+
+print(wins)
diff --git a/06/input b/06/input
new file mode 100644
index 0000000..4276bb5
--- /dev/null
+++ b/06/input
@@ -0,0 +1,2 @@
+Time:        45     98     83     73
+Distance:   295   1734   1278   1210
diff --git a/06/input-ex b/06/input-ex
new file mode 100644
index 0000000..28f5ae9
--- /dev/null
+++ b/06/input-ex
@@ -0,0 +1,2 @@
+Time:      7  15   30
+Distance:  9  40  200