diff --git a/Project308/TimerViewController.swift b/Project308/TimerViewController.swift
index 84e19cd..7eea38f 100644
--- a/Project308/TimerViewController.swift
+++ b/Project308/TimerViewController.swift
@@ -19,12 +19,14 @@ class TimerViewController: UIViewController, UIPickerViewDataSource, UIPickerVie
         minute = 0.0
         second = 0.0
         timeLabel.text = "00:00:00"
+        isRunning = false
     }
     
     @IBAction func startStopPressed(_ sender: UIButton) {
         if isRunning == false {
             isRunning = true
             startStopButton.setTitle("Stop", for: UIControl.State.normal)
+            timeLoop()
         }
         else{
             isRunning = false
@@ -61,7 +63,7 @@ class TimerViewController: UIViewController, UIPickerViewDataSource, UIPickerVie
         hour = Double(timePicker.selectedRow(inComponent: 0))
         minute = Double(timePicker.selectedRow(inComponent: 1))
         second = Double(timePicker.selectedRow(inComponent: 2))
-        let timeString = "\(hour):\(minute):\(second))"
+        let timeString = "\(timePicker.selectedRow(inComponent: 0)):\(timePicker.selectedRow(inComponent: 1)):\(timePicker.selectedRow(inComponent: 2))"
         timeLabel.text! = timeString
     }
     
@@ -92,6 +94,7 @@ class TimerViewController: UIViewController, UIPickerViewDataSource, UIPickerVie
                             hours -= 1
                             minutes = 59
                             seconds = 60
+
                         }
                     }
                 }
@@ -106,7 +109,7 @@ class TimerViewController: UIViewController, UIPickerViewDataSource, UIPickerVie
                 let minuteStr = String.init(format: "%02d", minutes)
                 let secondsStr = String.init(format: "%02d", seconds)
                 
-                let timeString = "\(hourStr):\(minuteStr):\(secondsStr))"
+                let timeString = "\(hourStr):\(minuteStr):\(secondsStr)"
                 
                 DispatchQueue.main.async {
                     self.timeLabel.text! = timeString