diff --git a/PandaSDK.podspec b/PandaSDK.podspec
index dd18135..8b5d9b9 100644
--- a/PandaSDK.podspec
+++ b/PandaSDK.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
   #
 
   spec.name         = "PandaSDK"
-  spec.version      = "0.7.17"
+  spec.version      = "0.8.0"
   spec.summary      = "Panda pod which will help us boost our revenue."
 
   # This description is used to generate tags and improve search results.
diff --git a/Sources/PandaSDK/Models/PandaPayload.swift b/Sources/PandaSDK/Models/PandaPayload.swift
index 7c8d532..023e554 100644
--- a/Sources/PandaSDK/Models/PandaPayload.swift
+++ b/Sources/PandaSDK/Models/PandaPayload.swift
@@ -26,9 +26,7 @@ public struct PandaPayload {
         strings: [[String: String]]? = nil,
         lessonTitle: String? = nil,
         customId: String? = nil,
-        email: String? = nil,
-        course: String? = nil,
-        variant: String? = nil
+        email: String? = nil
     ) {
         self.shouldShowDefaultScreen = shouldShowDefaultScreen
         self.screenBackgroundColor = screenBackgroundColor
@@ -57,13 +55,6 @@ public struct PandaPayload {
         if let email = email {
             data["email"] = email
         }
-        
-        if let course = course {
-            data["course"] = course
-        }
-        if let variant = variant {
-            data["variant"] = variant
-        }
 
         self.data = data
     }
diff --git a/Sources/PandaSDK/Views/WebViewController.swift b/Sources/PandaSDK/Views/WebViewController.swift
index c1764c2..59e1ea4 100644
--- a/Sources/PandaSDK/Views/WebViewController.swift
+++ b/Sources/PandaSDK/Views/WebViewController.swift
@@ -100,6 +100,7 @@ final class WebViewController: UIViewController, WKScriptMessageHandler {
     override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
         if keyPath == "loading", !wv.isLoading {
             handleScreenDidLoad()
+            didFinishLoading(nil)
         }
     }
     
@@ -331,7 +332,6 @@ final class WebViewController: UIViewController, WKScriptMessageHandler {
         wv.alpha = 1
         loadingIndicator.stopAnimating()
         pandaLog("html did load \(Date().timeIntervalSince1970) \(Date())")
-        didFinishLoading(nil)
     }
     
     @objc private func failedByTimeOut() {