diff --git a/Podfile.lock b/Podfile.lock
index 846d424a..8244aec8 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -1,40 +1,36 @@
 PODS:
-  - Alamofire (4.7.2)
-  - BouncyLayout (2.1.0)
+  - Alamofire (4.9.1)
+  - BouncyLayout (2.2.0)
   - CTShowcase (2.4.0)
   - Fakery (3.3.0)
-  - FTPopOverMenu_Swift (0.1.3)
-  - Ji (2.1.0):
-    - Ji/Ji (= 2.1.0)
-  - Ji/Ji (2.1.0):
-    - Ji/Ji-libxml
-  - Ji/Ji-libxml (2.1.0)
+  - FTPopOverMenu_Swift (0.1.4)
+  - Ji (5.0.0)
   - Kingfisher (4.10.1)
-  - Localize-Swift (2.0.0)
+  - Localize-Swift (3.1.0)
   - M13Checkbox (3.4.0)
-  - Material (2.17.0):
-    - Material/Core (= 2.17.0)
-  - Material/Core (2.17.0):
-    - Motion (~> 1.5.0)
-  - Motion (1.5.0):
-    - Motion/Core (= 1.5.0)
-  - Motion/Core (1.5.0)
-  - NVActivityIndicatorView (4.4.0):
-    - NVActivityIndicatorView/Presenter (= 4.4.0)
-  - NVActivityIndicatorView/Presenter (4.4.0)
-  - paper-onboarding (5.0.0)
-  - ReachabilitySwift (4.1.0)
-  - ReadabilityKit (0.7.1):
-    - Ji
-  - Realm (3.7.2):
-    - Realm/Headers (= 3.7.2)
-  - Realm/Headers (3.7.2)
-  - RealmSwift (3.7.2):
-    - Realm (= 3.7.2)
+  - Material (3.1.8):
+    - Material/Core (= 3.1.8)
+  - Material/Core (3.1.8):
+    - Motion (~> 3.1.1)
+  - Motion (3.1.3):
+    - Motion/Core (= 3.1.3)
+  - Motion/Core (3.1.3)
+  - NVActivityIndicatorView (4.8.0):
+    - NVActivityIndicatorView/Presenter (= 4.8.0)
+  - NVActivityIndicatorView/Presenter (4.8.0)
+  - paper-onboarding (6.1.4)
+  - ReachabilitySwift (5.0.0)
+  - ReadabilityKit (0.7.4):
+    - Ji (= 5.0.0)
+  - Realm (4.3.0):
+    - Realm/Headers (= 4.3.0)
+  - Realm/Headers (4.3.0)
+  - RealmSwift (4.3.0):
+    - Realm (= 4.3.0)
   - SwiftDate (4.5.1)
-  - SwiftKeychainWrapper (3.2.0)
-  - SwiftValidators (7.0.3)
-  - Toast-Swift (4.0.0)
+  - SwiftKeychainWrapper (3.4.0)
+  - SwiftValidators (9.0.2)
+  - Toast-Swift (4.0.1)
 
 DEPENDENCIES:
   - Alamofire (~> 4.7)
@@ -58,7 +54,7 @@ DEPENDENCIES:
   - Toast-Swift (~> 4.0.0)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - Alamofire
     - BouncyLayout
     - CTShowcase
@@ -89,35 +85,35 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   Material:
-    :commit: 4ab1b08c3365a00f409a210162ae72ed8425f299
+    :commit: ea59f7c4d72a4c3a3694042b05d4276e2ffd4e26
     :git: https://github.com/CosmicMind/Material.git
   Motion:
-    :commit: 3141bdb87e30b4aa899a22562194a221ea2da388
+    :commit: 808ac0cf1b67c5e4163ee867dd6c056836fcbc58
     :git: https://github.com/CosmicMind/Motion.git
 
 SPEC CHECKSUMS:
-  Alamofire: e4fa87002c137ba2d8d634d2c51fabcda0d5c223
-  BouncyLayout: a7955879861375cc4e88bb64d42bcf622cd2694c
+  Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
+  BouncyLayout: b8be605d6c729086d0fc83f180f71e804abeaf04
   CTShowcase: d6a7933f0724dadc12399b4d6d4815b419f1eb65
   Fakery: 3aae11a87721c807c18c6456500d088c1230d3e5
-  FTPopOverMenu_Swift: f67e0af3935485c1cbcc44b5c92ed530ee32d21d
-  Ji: 21946da4e13425485ddd424edfaeeced0d80ad28
+  FTPopOverMenu_Swift: e4cafd1085d8125339c710fa9e53477fd615b1e2
+  Ji: d795fed288fe78658b404c88946d753b17d8d7f4
   Kingfisher: c148cd7b47ebde9989f6bc7c27dcaa79d81279a0
-  Localize-Swift: c798ec9286494866f7068f85f7c71283ac5bdab4
+  Localize-Swift: 4bed4f0ccac8be2ec3517ee359da80ba2adb0fae
   M13Checkbox: 6f59404540ac98ba83a3d1afac335895a40c6a5d
-  Material: 856e0168ab93fc477f875577c152c9e62f4ab869
-  Motion: 3acabedc5a499f6b12deaa34deb68b425b005720
-  NVActivityIndicatorView: ec7440a57af2450319d3a4181cca7da6fc127064
-  paper-onboarding: a2e3a710fd27ac0b5635ec5490660e7ec09289b5
-  ReachabilitySwift: 6849231cd4e06559f3b9ef4a97a0a0f96d41e09f
-  ReadabilityKit: 45e79725f6d0377c555f38d9df7a6d4435898c04
-  Realm: dd18c3014e8d90df300b83c6da740067436089c5
-  RealmSwift: 79917cae59a0c43ef8118b233a5978891dd50b4a
+  Material: e9965c31d6e77f495e82d0b0564efe8d5c11bcc3
+  Motion: 4519d0019e9a68f5f70c366f26ff49efaff0017b
+  NVActivityIndicatorView: d24b7ebcf80af5dcd994adb650e2b6c93379270f
+  paper-onboarding: d3f16416e6f42add686117e8b32bfffaad899a79
+  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
+  ReadabilityKit: 09e8b2ecb3d06f17f4c856e426c34f9016e86e6f
+  Realm: 9357c3589555793e1860a7104a7412bca4a48d99
+  RealmSwift: 402f1e379a8ef82c635313037b043f0f06de880c
   SwiftDate: 7b56d42a221f582047287deb256b23fc5ed49a60
-  SwiftKeychainWrapper: 82c4c02cdc36f9a24f7edfcaab3e336401caa1a1
-  SwiftValidators: 660ce9ef3f0358c25c3a6154f7edc02c7d4a0578
-  Toast-Swift: 594b5c5e5129f15438e410207e43287f027b3c00
+  SwiftKeychainWrapper: 6fc49fbf7d4a6b0772917acb0e53a1639f6078d6
+  SwiftValidators: 9be131cdfadb9a29d31e637c947c7306877bf1d4
+  Toast-Swift: e42a638589a2f95036b4bb7626cfbdde7daf0393
 
 PODFILE CHECKSUM: c0d3ac6392c31961b5f3a0108501cdaf990069ee
 
-COCOAPODS: 1.7.2
+COCOAPODS: 1.8.4
diff --git a/Susi.xcodeproj/project.pbxproj b/Susi.xcodeproj/project.pbxproj
index ea7bb959..8b72bffb 100644
--- a/Susi.xcodeproj/project.pbxproj
+++ b/Susi.xcodeproj/project.pbxproj
@@ -806,10 +806,9 @@
 			};
 			buildConfigurationList = 6D4D9B321E768E190067459C /* Build configuration list for PBXProject "Susi" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 				Base,
 				ru,
diff --git a/Susi.xcworkspace/xcshareddata/xcschemes/Susi.xcscheme b/Susi.xcworkspace/xcshareddata/xcschemes/Susi.xcscheme
index c8ae730c..19895a01 100644
--- a/Susi.xcworkspace/xcshareddata/xcschemes/Susi.xcscheme
+++ b/Susi.xcworkspace/xcshareddata/xcschemes/Susi.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6D4D9B361E768E190067459C"
+            BuildableName = "Susi.app"
+            BlueprintName = "Susi"
+            ReferencedContainer = "container:Susi.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -45,17 +54,6 @@
             </SkippedTests>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6D4D9B361E768E190067459C"
-            BuildableName = "Susi.app"
-            BlueprintName = "Susi"
-            ReferencedContainer = "container:Susi.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
diff --git a/Susi/Controllers/ChatViewController/ChatViewController.swift b/Susi/Controllers/ChatViewController/ChatViewController.swift
index 312457ad..28090c92 100644
--- a/Susi/Controllers/ChatViewController/ChatViewController.swift
+++ b/Susi/Controllers/ChatViewController/ChatViewController.swift
@@ -28,7 +28,7 @@ class ChatViewController: UICollectionViewController {
         fatalError("init(coder:) has not been implemented")
     }
     // MARK: - Variable Declarations
-    let reachability = Reachability()!
+    let reachability = try! Reachability()
     var shouldOpenSkillListing: Bool = false
     lazy var susiSkillListingButton: IconButton = {
         let ib = IconButton()
diff --git a/Susi/Controllers/LoginController/LoginViewController.swift b/Susi/Controllers/LoginController/LoginViewController.swift
index 54be66aa..2720138f 100644
--- a/Susi/Controllers/LoginController/LoginViewController.swift
+++ b/Susi/Controllers/LoginController/LoginViewController.swift
@@ -16,7 +16,7 @@ import paper_onboarding
 
 class LoginViewController: GeneralViewController {
 
-    let reachability = Reachability()!
+    let reachability = try! Reachability()
 
     let alert = UIAlertController(title: "Warning", message: "Please Connect to Internet", preferredStyle: .alert)
 
diff --git a/Susi/Controllers/SelectLanguageController/SelectLanguageViewController.swift b/Susi/Controllers/SelectLanguageController/SelectLanguageViewController.swift
index 91642f10..1867d729 100644
--- a/Susi/Controllers/SelectLanguageController/SelectLanguageViewController.swift
+++ b/Susi/Controllers/SelectLanguageController/SelectLanguageViewController.swift
@@ -12,7 +12,7 @@ import Reachability
 
 class SelectLanguageViewController: UIViewController {
    
-    let reachability = Reachability()!
+    let reachability = try! Reachability()
     
     var languageModel: [LanguageModel] = []
     var searchedlanguageModel: [LanguageModel] = []
diff --git a/Susi/Controllers/SkillListingViewController/SkillListingViewController.swift b/Susi/Controllers/SkillListingViewController/SkillListingViewController.swift
index 03c2a796..f6ec6afd 100644
--- a/Susi/Controllers/SkillListingViewController/SkillListingViewController.swift
+++ b/Susi/Controllers/SkillListingViewController/SkillListingViewController.swift
@@ -14,7 +14,7 @@ class SkillListingViewController: UITableViewController {
 
     // for opening settings view controller
 
-    let reachability = Reachability()!
+    let reachability = try! Reachability()
     var dismissChecker: Bool?
     lazy var settingsButton: IconButton = {
         let ib = IconButton()
diff --git a/Susi/Controllers/SkillListingViewController/noConnectionViewController.swift b/Susi/Controllers/SkillListingViewController/noConnectionViewController.swift
index 00beb25f..afa0d970 100644
--- a/Susi/Controllers/SkillListingViewController/noConnectionViewController.swift
+++ b/Susi/Controllers/SkillListingViewController/noConnectionViewController.swift
@@ -11,7 +11,7 @@ import Reachability
 
 class noConnectionViewController: UIViewController {
     var skillListingInstance: SkillListingViewController?
-    let reachability = Reachability()!
+    let reachability = try! Reachability()
 
     let shapelayer = CAShapeLayer()
     var blinkStatus = true