     }
 
     var hour: Int {
-        return (Calendar.current as NSCalendar).components(.hour, from: self).hour!
+        return Calendar.current.component(.hour, from: self)
     }
 
     var minutes: Int {
-        return (Calendar.current as NSCalendar).components(.minute, from: self).minute!
+        return Calendar.current.component(.minute, from: self)
     }
 
     var minutesString: String {

    }

    var month: Int {
        return (Calendar.current as NSCalendar).components(.month, from: self).month!
    }

    var dayOfMonth: Int {

    }

    var year: Int {
        return Calendar.current.component(.year, from: self)
    }

    var dayOfWeek: String {
