diff --git a/ScreenShare/ScreenShare.entitlements b/ScreenShare/ScreenShare.entitlements
index 2099144..2eb7e33 100644
--- a/ScreenShare/ScreenShare.entitlements
+++ b/ScreenShare/ScreenShare.entitlements
@@ -3,8 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.application-groups</key>
-	<array>
-		<string>group.io.antmedia.ios.webrtc.sample</string>
-	</array>
+	<array/>
 </dict>
 </plist>
diff --git a/WebRTC-Sample-App/Base.lproj/Main.storyboard b/WebRTC-Sample-App/Base.lproj/Main.storyboard
index 483a81a..04170dc 100644
--- a/WebRTC-Sample-App/Base.lproj/Main.storyboard
+++ b/WebRTC-Sample-App/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -18,7 +18,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="U8S-UW-oXC">
-                                <rect key="frame" x="95" y="87" width="200" height="200"/>
+                                <rect key="frame" x="87.666666666666686" y="87" width="200" height="200"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="200" id="1mh-o1-svn"/>
                                     <constraint firstAttribute="width" secondItem="U8S-UW-oXC" secondAttribute="height" multiplier="1:1" id="KfE-gR-cN6"/>
@@ -26,10 +26,10 @@
                                 </constraints>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dMz-6A-4JU">
-                                <rect key="frame" x="65" y="257" width="260" height="439"/>
+                                <rect key="frame" x="65" y="257" width="245" height="325"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wtb-z3-Op3">
-                                        <rect key="frame" x="12.666666666666686" y="10" width="235" height="62"/>
+                                        <rect key="frame" x="5" y="10" width="235" height="62"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="235" id="0c1-KP-HAt"/>
                                             <constraint firstAttribute="height" constant="62" id="4qM-Ld-Ubq"/>
@@ -47,7 +47,7 @@ WebRTC Live Streaming</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Room name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="WPm-03-EZ0">
-                                        <rect key="frame" x="6" y="90" width="248" height="30"/>
+                                        <rect key="frame" x="6" y="90" width="233" height="30"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="30" id="lDx-qO-ch4"/>
                                         </constraints>
@@ -58,14 +58,14 @@ WebRTC Live Streaming</string>
                                         </connections>
                                     </textField>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Sor-To-6JJ">
-                                        <rect key="frame" x="3" y="124" width="254" height="1.6666666666666714"/>
+                                        <rect key="frame" x="3" y="124" width="239" height="1.6666666666666714"/>
                                         <color key="backgroundColor" red="0.8666666666666667" green="0.13725490196078433" blue="0.12941176470588237" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="1.5" id="K1Q-Vw-hNs"/>
                                         </constraints>
                                     </view>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5ym-6R-Akx">
-                                        <rect key="frame" x="3" y="374" width="254" height="35"/>
+                                        <rect key="frame" x="3" y="260" width="239" height="35"/>
                                         <color key="backgroundColor" red="0.86666666670000003" green="0.13725490200000001" blue="0.12941176469999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="35" id="th5-xa-8Fc"/>
@@ -80,7 +80,7 @@ WebRTC Live Streaming</string>
                                         </connections>
                                     </button>
                                     <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="tve-qy-d3T">
-                                        <rect key="frame" x="3" y="155.66666666666669" width="254" height="32"/>
+                                        <rect key="frame" x="3" y="155.66666666666669" width="239" height="32"/>
                                         <segments>
                                             <segment title="Publish"/>
                                             <segment title="Play"/>
@@ -89,7 +89,7 @@ WebRTC Live Streaming</string>
                                         <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </segmentedControl>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Inj-Ay-988">
-                                        <rect key="frame" x="6" y="340" width="248" height="36"/>
+                                        <rect key="frame" x="6" y="226" width="233" height="36"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="36" id="vla-6X-HS0"/>
                                         </constraints>
@@ -125,7 +125,7 @@ WebRTC Live Streaming</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GZ9-KN-4BS" customClass="RPSystemBroadcastPickerView">
-                                <rect key="frame" x="162.66666666666666" y="696" width="65" height="50"/>
+                                <rect key="frame" x="162.66666666666666" y="582" width="50" height="50"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="50" id="27V-Uq-gnp"/>
@@ -168,27 +168,27 @@ WebRTC Live Streaming</string>
             <objects>
                 <viewController storyboardIdentifier="Conference" id="E4n-9I-LrE" customClass="ConferenceViewController" customModule="WebRTC_Sample_App" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="CM5-Lj-3ty">
-                        <rect key="frame" x="0.0" y="0.0" width="390" height="787"/>
+                        <rect key="frame" x="0.0" y="0.0" width="390" height="834"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zBK-Om-nWf">
-                                <rect key="frame" x="16" y="47" width="179" height="370"/>
+                                <rect key="frame" x="16" y="0.0" width="179" height="417"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PKz-rN-me0">
-                                <rect key="frame" x="206.66666666666663" y="47" width="175.33333333333337" height="346.66666666666669"/>
+                                <rect key="frame" x="206.66666666666663" y="0.0" width="175.33333333333337" height="417"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qPy-8E-T6N">
-                                <rect key="frame" x="16" y="417" width="179" height="350"/>
+                                <rect key="frame" x="16" y="417" width="179" height="397"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LXN-aK-Wm3">
-                                <rect key="frame" x="195" y="417" width="196" height="350"/>
+                                <rect key="frame" x="195" y="417" width="196" height="397"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zwp-DO-5T7">
-                                <rect key="frame" x="267" y="607" width="90" height="160"/>
+                                <rect key="frame" x="267" y="654" width="90" height="160"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="160" id="dnu-X9-a9W"/>
@@ -233,22 +233,22 @@ WebRTC Live Streaming</string>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="6tn-JR-W3G" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1194.4000000000001" y="869.41529235382313"/>
+            <point key="canvasLocation" x="1193.8461538461538" y="868.72037914691941"/>
         </scene>
         <!--Video View Controller-->
         <scene sceneID="pqe-YK-PtD">
             <objects>
                 <viewController storyboardIdentifier="Video" id="xVm-wQ-O5q" customClass="VideoViewController" customModule="WebRTC_Sample_App" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="LyJ-zl-XYS">
-                        <rect key="frame" x="0.0" y="0.0" width="390" height="787"/>
+                        <rect key="frame" x="0.0" y="0.0" width="390" height="834"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view hidden="YES" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="cFD-yb-BM7" customClass="RTCEAGLVideoView">
-                                <rect key="frame" x="0.0" y="47" width="390" height="740"/>
+                                <rect key="frame" x="0.0" y="0.0" width="390" height="834"/>
                                 <color key="backgroundColor" red="0.32549019607843138" green="0.32549019607843138" blue="0.32549019607843138" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </view>
                             <view contentMode="scaleAspectFit" translatesAutoresizingMaskIntoConstraints="NO" id="lwh-ZV-HkX" customClass="RTCEAGLVideoView">
-                                <rect key="frame" x="270" y="637" width="90" height="120"/>
+                                <rect key="frame" x="270" y="684" width="90" height="120"/>
                                 <color key="backgroundColor" red="0.086274509803921567" green="0.086274509803921567" blue="0.086274509803921567" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="120" id="FEQ-6q-T1I"/>
@@ -256,7 +256,7 @@ WebRTC Live Streaming</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="H3f-3T-91O">
-                                <rect key="frame" x="15" y="293.66666666666669" width="45" height="200"/>
+                                <rect key="frame" x="15" y="317" width="45" height="200"/>
                                 <subviews>
                                     <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5j2-CR-zdD" userLabel="Audio Button">
                                         <rect key="frame" x="2" y="0.0" width="40" height="40"/>
diff --git a/WebRTC-Sample-App/ConferenceViewController.swift b/WebRTC-Sample-App/ConferenceViewController.swift
index 7b44aa7..3622b01 100644
--- a/WebRTC-Sample-App/ConferenceViewController.swift
+++ b/WebRTC-Sample-App/ConferenceViewController.swift
@@ -26,9 +26,46 @@ open class ConferenceViewController: UIViewController , AVCaptureVideoDataOutput
     @IBOutlet var remoteView1: UIView!
     @IBOutlet var remoteView2: UIView!
     @IBOutlet var remoteView3: UIView!
-        
+    
+    lazy private var muteButton: UIButton = {
+        let button: UIButton = .init()
+        if #available(iOS 15.0, *) {
+            var config: UIButton.Configuration = .bordered()
+            config.imagePadding = 8
+            button.configuration = config
+        }
+        button.backgroundColor = .systemBlue
+        button.setTitle("Mute", for: .normal)
+        button.setTitleColor(.white, for: .normal)
+        button.layer.cornerRadius = 6
+        button.clipsToBounds = true
+        button.sizeToFit()
+        button.titleLabel?.sizeToFit()
+        button.tintColor = .white
+        button.setImage(
+            UIImage(systemName: "mic.circle.fill")?
+                .withTintColor(
+                    .white,
+                    renderingMode: .alwaysTemplate
+                ),
+            for: .normal
+        )
+        button.imageView?.tintColor = .white
+        return button
+    }()
+    
+    lazy private var audioLevelLabel: UILabel = {
+        let lbl = UILabel()
+        lbl.font = .systemFont(ofSize: 12, weight: .medium)
+        return lbl
+    }()
+    
+    var isMuted = false
+    
     var remoteViews:[RTCVideoRenderer] = []
     
+    var timer: Timer?
+    
     //keeps which remoteView renders which track according to the index
     var remoteViewTrackMap: [RTCVideoTrack?] = [];
         
@@ -58,6 +95,14 @@ open class ConferenceViewController: UIViewController , AVCaptureVideoDataOutput
        
     }
     
+    open override func viewDidLoad() {
+        super.viewDidLoad()
+        self.view.addSubview(muteButton)
+        self.view.addSubview(audioLevelLabel)
+        self.setupMuteButton()
+        self.setupAudioLevel(0)
+    }
+    
     open override func viewWillAppear(_ animated: Bool)
     {
         
@@ -67,7 +112,6 @@ open class ConferenceViewController: UIViewController , AVCaptureVideoDataOutput
         initRenderer(view: remoteView2)
         initRenderer(view: remoteView3)
        
-        
         AntMediaClient.setDebug(true)
         self.conferenceClient =  AntMediaClient.init();
         self.conferenceClient?.delegate = self
@@ -82,6 +126,40 @@ open class ConferenceViewController: UIViewController , AVCaptureVideoDataOutput
         self.conferenceClient?.play(streamId: self.roomId);
     }
     
+    open override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+        let width: CGFloat = 100
+        muteButton.frame = .init(
+            x: self.view.frame.width / 2 - width / 2,
+            y: self.view.frame.height - 100,
+            width: width,
+            height: 40)
+        
+        audioLevelLabel.frame = .init(
+            x: self.view.frame.width / 2 - audioLevelLabel.frame.width / 2,
+            y: muteButton.frame.origin.y - 60,
+            width: audioLevelLabel.frame.width,
+            height: audioLevelLabel.frame.height
+        )
+    }
+    
+    open override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        timer = .scheduledTimer(withTimeInterval: 0.33, repeats: true, block: { _ in
+            guard let client = self.conferenceClient, client.isDataChannelActive() else {
+                return
+            }
+            
+            client.getStatistics { [weak self] statistics in
+                // TODO: handle statistics
+                DispatchQueue.main.async {
+                    self?.setupAudioLevel(statistics.audioLevel * 100)
+                }
+            }
+        })
+        
+    }
+    
     open override func viewWillDisappear(_ animated: Bool) {
         //stop playing
         self.conferenceClient?.stop(streamId: self.roomId);
@@ -89,7 +167,7 @@ open class ConferenceViewController: UIViewController , AVCaptureVideoDataOutput
         //stop publishing
         self.conferenceClient?.stop(streamId: self.publisherStreamId);
 
-        
+        timer?.invalidate()
     }
     
     public func removePlayers() {
@@ -109,9 +187,41 @@ open class ConferenceViewController: UIViewController , AVCaptureVideoDataOutput
             }
         }
     }
+    
+    private func setupAudioLevel(_ level: Double) {
+        if isMuted {
+            audioLevelLabel.text = ""
+            
+            if level > 10 {
+                audioLevelLabel.text = "Are you talking?"
+            }
+            return
+        }
+        audioLevelLabel.text = .init(format: "Audio Level: %.2f", level)
+        audioLevelLabel.sizeToFit()
+    }
+    
+    private func setupMuteButton() {
+        muteButton.setTitle(isMuted ? "Unmute" : "Mute", for: .normal)
+        muteButton.isUserInteractionEnabled = true
+        muteButton.setImage(
+            UIImage(systemName: isMuted ? "mic.slash.fill" : "mic.circle.fill")?
+                .withTintColor(
+                    .white,
+                    renderingMode: .alwaysTemplate
+                ),
+            for: .normal
+        )
+        muteButton.addTarget(self, action: #selector(onClickMute), for: .touchUpInside)
+    }
+    
+    @objc private func onClickMute() {
+        isMuted.toggle()
+        conferenceClient?.toggleAudio()
+        setupMuteButton()
+    }
 }
 
-
 extension ConferenceViewController: AntMediaClientDelegate
 {
     public func clientHasError(_ message: String) {
@@ -217,6 +327,20 @@ extension ConferenceViewController: AntMediaClientDelegate
     
     public func publishStarted(streamId: String) {
         AntMediaClient.printf("Publish started for stream:\(streamId)")
+        
+        conferenceClient?.getBroadcastObject(forStreamId: self.roomId)
+    }
+    
+    public func eventHappened(streamId: String, eventType: String, payload: [String : Any]?) {
+        debugPrint("Event: \(streamId) - \(eventType) \(payload ?? [:])")
+        if eventType == "TRACK_LIST_UPDATED" {
+            conferenceClient?.getBroadcastObject(forStreamId: streamId)
+        }
+    }
+    
+    public func onLoadBroadcastObject(streamId: String, message: [String : Any]) {
+        debugPrint(streamId)
+        debugPrint(message)
     }
     
     public func publishFinished(streamId: String) {
diff --git a/WebRTC-Sample-App/VideoViewController.swift b/WebRTC-Sample-App/VideoViewController.swift
index dd14159..8ca2dcf 100644
--- a/WebRTC-Sample-App/VideoViewController.swift
+++ b/WebRTC-Sample-App/VideoViewController.swift
@@ -83,7 +83,7 @@ class VideoViewController: UIViewController {
             self.client!.setCameraPosition(position: .front)
             self.client!.setTargetResolution(width: 640, height: 360)
             self.client!.setLocalView(container: fullVideoView, mode: .scaleAspectFit)
-            
+
             //calling this method is not necessary. It just initializes the connection and opens the camera
             self.client!.initPeerConnection(streamId: self.clientStreamId);
             
diff --git a/WebRTC-Sample-App/WebRTC-Sample-App.entitlements b/WebRTC-Sample-App/WebRTC-Sample-App.entitlements
index 2099144..2eb7e33 100644
--- a/WebRTC-Sample-App/WebRTC-Sample-App.entitlements
+++ b/WebRTC-Sample-App/WebRTC-Sample-App.entitlements
@@ -3,8 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.application-groups</key>
-	<array>
-		<string>group.io.antmedia.ios.webrtc.sample</string>
-	</array>
+	<array/>
 </dict>
 </plist>
diff --git a/WebRTC-Sample-App/WebRTC-Sample-AppDebug.entitlements b/WebRTC-Sample-App/WebRTC-Sample-AppDebug.entitlements
index 2099144..2eb7e33 100644
--- a/WebRTC-Sample-App/WebRTC-Sample-AppDebug.entitlements
+++ b/WebRTC-Sample-App/WebRTC-Sample-AppDebug.entitlements
@@ -3,8 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.application-groups</key>
-	<array>
-		<string>group.io.antmedia.ios.webrtc.sample</string>
-	</array>
+	<array/>
 </dict>
 </plist>
diff --git a/WebRTCiOSSDK.xcodeproj/project.pbxproj b/WebRTCiOSSDK.xcodeproj/project.pbxproj
index 2ee4f87..f44d471 100644
--- a/WebRTCiOSSDK.xcodeproj/project.pbxproj
+++ b/WebRTCiOSSDK.xcodeproj/project.pbxproj
@@ -7,6 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		2E216D362BB809C70035C239 /* ClientStatistics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E216D352BB809C70035C239 /* ClientStatistics.swift */; };
+		2E216D3D2BB8239D0035C239 /* Dictionary+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E216D3C2BB8239D0035C239 /* Dictionary+Extensions.swift */; };
+		2E2350892BE11B000091FEA9 /* NetworkQuality.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E2350882BE11B000091FEA9 /* NetworkQuality.swift */; };
+		2EA8C5312BABD23B00F6C304 /* AntMediaClient+Audio.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EA8C5302BABD23B00F6C304 /* AntMediaClient+Audio.swift */; };
 		A8B965F62A06969900D67CA1 /* ReplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A8B965F52A06969900D67CA1 /* ReplayKit.framework */; };
 		A8B965F92A06969900D67CA1 /* SampleHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8B965F82A06969900D67CA1 /* SampleHandler.swift */; };
 		A8B965FD2A06969A00D67CA1 /* ScreenShare.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = A8B965F42A06969900D67CA1 /* ScreenShare.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -137,6 +141,10 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		2E216D352BB809C70035C239 /* ClientStatistics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientStatistics.swift; sourceTree = "<group>"; };
+		2E216D3C2BB8239D0035C239 /* Dictionary+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Dictionary+Extensions.swift"; sourceTree = "<group>"; };
+		2E2350882BE11B000091FEA9 /* NetworkQuality.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkQuality.swift; sourceTree = "<group>"; };
+		2EA8C5302BABD23B00F6C304 /* AntMediaClient+Audio.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AntMediaClient+Audio.swift"; sourceTree = "<group>"; };
 		A8522FE02B832967007BC5A8 /* WebRTC-Sample-AppDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "WebRTC-Sample-AppDebug.entitlements"; sourceTree = "<group>"; };
 		A8B965F42A06969900D67CA1 /* ScreenShare.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ScreenShare.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		A8B965F52A06969900D67CA1 /* ReplayKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReplayKit.framework; path = System/Library/Frameworks/ReplayKit.framework; sourceTree = SDKROOT; };
@@ -237,6 +245,22 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		2E216D342BB809B80035C239 /* utils */ = {
+			isa = PBXGroup;
+			children = (
+				2E216D352BB809C70035C239 /* ClientStatistics.swift */,
+			);
+			path = utils;
+			sourceTree = "<group>";
+		};
+		2E216D3B2BB823910035C239 /* extensions */ = {
+			isa = PBXGroup;
+			children = (
+				2E216D3C2BB8239D0035C239 /* Dictionary+Extensions.swift */,
+			);
+			path = extensions;
+			sourceTree = "<group>";
+		};
 		A8B965F72A06969900D67CA1 /* ScreenShare */ = {
 			isa = PBXGroup;
 			children = (
@@ -278,6 +302,8 @@
 		A8DABFCC2A0639D80007CDE7 /* WebRTCiOSSDK */ = {
 			isa = PBXGroup;
 			children = (
+				2E216D3B2BB823910035C239 /* extensions */,
+				2E216D342BB809B80035C239 /* utils */,
 				A8DABFE22A063A020007CDE7 /* api */,
 				A8DABFCD2A0639D80007CDE7 /* WebRTCiOSSDK.h */,
 			);
@@ -297,6 +323,7 @@
 			children = (
 				A8DABFE32A063A020007CDE7 /* ConferenceClient.swift */,
 				A8DABFE42A063A020007CDE7 /* AntMediaClient.swift */,
+				2EA8C5302BABD23B00F6C304 /* AntMediaClient+Audio.swift */,
 				A8DABFE52A063A020007CDE7 /* AntMediaError.swift */,
 				A8DABFE62A063A020007CDE7 /* AntMediaClientProtocol.swift */,
 				A8DABFE72A063A020007CDE7 /* AntMediaClientDelegate.swift */,
@@ -314,6 +341,7 @@
 				A8DABFEC2A063A020007CDE7 /* WebRTCClient.swift */,
 				A8DABFED2A063A020007CDE7 /* Dictionary.swift */,
 				A8DABFEE2A063A020007CDE7 /* String.swift */,
+				2E2350882BE11B000091FEA9 /* NetworkQuality.swift */,
 			);
 			path = webrtc;
 			sourceTree = "<group>";
@@ -639,12 +667,16 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2EA8C5312BABD23B00F6C304 /* AntMediaClient+Audio.swift in Sources */,
+				2E216D362BB809C70035C239 /* ClientStatistics.swift in Sources */,
 				A8DABFEF2A063A020007CDE7 /* ConferenceClient.swift in Sources */,
+				2E216D3D2BB8239D0035C239 /* Dictionary+Extensions.swift in Sources */,
 				A8DABFF92A063A020007CDE7 /* String.swift in Sources */,
 				A8DABFF82A063A020007CDE7 /* Dictionary.swift in Sources */,
 				A8DABFF02A063A020007CDE7 /* AntMediaClient.swift in Sources */,
 				A8DABFF42A063A020007CDE7 /* RTCCustomFrameCapturer.swift in Sources */,
 				A8DABFF52A063A020007CDE7 /* Config.swift in Sources */,
+				2E2350892BE11B000091FEA9 /* NetworkQuality.swift in Sources */,
 				A8DABFF12A063A020007CDE7 /* AntMediaError.swift in Sources */,
 				A8DABFF72A063A020007CDE7 /* WebRTCClient.swift in Sources */,
 				A8DABFF32A063A020007CDE7 /* AntMediaClientDelegate.swift in Sources */,
@@ -757,7 +789,7 @@
 				CODE_SIGN_ENTITLEMENTS = ScreenShare/ScreenShare.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = MJU7KX4L7S;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ScreenShare/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ScreenShare;
@@ -769,7 +801,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.webrtc.sample.screen.share;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.sample.screenshare;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -784,7 +816,7 @@
 				CODE_SIGN_ENTITLEMENTS = ScreenShare/ScreenShare.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = MJU7KX4L7S;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ScreenShare/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ScreenShare;
@@ -796,7 +828,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.webrtc.sample.screen.share;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.sample.screenshare;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -931,7 +963,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = 2YK9J8G25K;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -945,7 +977,7 @@
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.WebRTCiOSSDK;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.WebRTCiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -963,7 +995,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = 2YK9J8G25K;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -977,7 +1009,7 @@
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.WebRTCiOSSDK;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.WebRTCiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -995,10 +1027,10 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 2YK9J8G25K;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.WebRTCiOSSDKTests;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.WebRTCiOSSDKTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -1012,10 +1044,10 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 2YK9J8G25K;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.WebRTCiOSSDKTests;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.WebRTCiOSSDKTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -1033,7 +1065,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = MJU7KX4L7S;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "WebRTC-Sample-App/Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = "WebRTC Sample";
@@ -1050,7 +1082,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.webrtc.sample;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.sample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1072,7 +1104,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = MJU7KX4L7S;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "WebRTC-Sample-App/Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = "WebRTC Sample";
@@ -1089,7 +1121,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.webrtc.sample;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.sample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1108,11 +1140,11 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = MJU7KX4L7S;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.webrtc.sample.AppTests;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.sample.AppTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -1128,11 +1160,11 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = MJU7KX4L7S;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.webrtc.sample.AppTests;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.sample.AppTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -1147,11 +1179,11 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = MJU7KX4L7S;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.webrtc.sample.AppUITests;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.sample.AppUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -1166,11 +1198,11 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = MJU7KX4L7S;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.webrtc.sample.AppUITests;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.sample.AppUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
diff --git a/WebRTCiOSSDK.xcodeproj/project.xcworkspace/xcuserdata/applebro.xcuserdatad/UserInterfaceState.xcuserstate b/WebRTCiOSSDK.xcodeproj/project.xcworkspace/xcuserdata/applebro.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..5dff74b
Binary files /dev/null and b/WebRTCiOSSDK.xcodeproj/project.xcworkspace/xcuserdata/applebro.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/WebRTCiOSSDK.xcodeproj/xcshareddata/xcschemes/WebRTC-Sample-App.xcscheme b/WebRTCiOSSDK.xcodeproj/xcshareddata/xcschemes/WebRTC-Sample-App.xcscheme
index bea339f..ee17531 100644
--- a/WebRTCiOSSDK.xcodeproj/xcshareddata/xcschemes/WebRTC-Sample-App.xcscheme
+++ b/WebRTCiOSSDK.xcodeproj/xcshareddata/xcschemes/WebRTC-Sample-App.xcscheme
@@ -50,6 +50,13 @@
             ReferencedContainer = "container:WebRTCiOSSDK.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "IDEPreferLogStreaming"
+            value = "YES"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/WebRTCiOSSDK.xcodeproj/xcuserdata/applebro.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/WebRTCiOSSDK.xcodeproj/xcuserdata/applebro.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
new file mode 100644
index 0000000..1d267a3
--- /dev/null
+++ b/WebRTCiOSSDK.xcodeproj/xcuserdata/applebro.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "F8F1BB73-562E-4CCD-8509-C3AF78487F43"
+   type = "1"
+   version = "2.0">
+</Bucket>
diff --git a/WebRTCiOSSDK.xcodeproj/xcuserdata/applebro.xcuserdatad/xcschemes/xcschememanagement.plist b/WebRTCiOSSDK.xcodeproj/xcuserdata/applebro.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..301a59b
--- /dev/null
+++ b/WebRTCiOSSDK.xcodeproj/xcuserdata/applebro.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>ScreenShare.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+		<key>WebRTC-Sample-App.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+		<key>WebRTCiOSSDK.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/WebRTCiOSSDK/api/AntMediaClient+Audio.swift b/WebRTCiOSSDK/api/AntMediaClient+Audio.swift
new file mode 100644
index 0000000..5980de4
--- /dev/null
+++ b/WebRTCiOSSDK/api/AntMediaClient+Audio.swift
@@ -0,0 +1,67 @@
+//
+//  AntMediaClient+Audio.swift
+//  WebRTCiOSSDK
+//
+//  Created by applebro on 21/03/24.
+//
+
+import Foundation
+import AVFoundation
+
+extension AntMediaClient {
+    func setupAudioNotifications() {
+        // Get the default notification center instance.
+        let nc = NotificationCenter.default
+        nc.addObserver(self,
+                       selector: #selector(handleInterruption),
+                       name: AVAudioSession.interruptionNotification,
+                       object: AVAudioSession.sharedInstance())
+    }
+    
+    func removeAudioNotifications() {
+        // Get the default notification center instance.
+        let nc = NotificationCenter.default
+        nc.removeObserver(self,
+                          name: AVAudioSession.interruptionNotification,
+                          object: AVAudioSession.sharedInstance())
+    }
+    
+    @objc func handleInterruption(notification: Notification) {
+        guard let userInfo = notification.userInfo,
+              let typeValue = userInfo[AVAudioSessionInterruptionTypeKey] as? UInt,
+              let type = AVAudioSession.InterruptionType(rawValue: typeValue) else {
+            return
+        }
+        
+        
+        // Switch over the interruption type.
+        switch type {
+        case .began:
+            // An interruption began. Update the UI as necessary.
+            AntMediaClient.printf("Audio: interruption began")
+            break
+        case .ended:
+            // An interruption ended. Resume playback, if appropriate.
+            guard let optionsValue = userInfo[AVAudioSessionInterruptionOptionKey] as? UInt else { return }
+            let options = AVAudioSession.InterruptionOptions(rawValue: optionsValue)
+            if options.contains(.shouldResume) {
+                // An interruption ended. Resume playback.
+                AntMediaClient.printf("Audio: interruption ended and should resume playback")
+                activateAudioSession()
+            } else {
+                // An interruption ended. Don't resume playback.
+                AntMediaClient.printf("Audio: interruption ended and should not resume playback")
+            }
+        default: ()
+        }
+    }
+    
+    private func activateAudioSession() {
+        DispatchQueue(label: "audio").async {() in
+            AntMediaClient.rtcAudioSession.lockForConfiguration()
+            AntMediaClient.rtcAudioSession.isAudioEnabled = true
+            AntMediaClient.rtcAudioSession.unlockForConfiguration()
+            AntMediaClient.printf("Audio: Activated")
+        }
+    }
+}
diff --git a/WebRTCiOSSDK/api/AntMediaClient.swift b/WebRTCiOSSDK/api/AntMediaClient.swift
index c9e5f24..8670436 100644
--- a/WebRTCiOSSDK/api/AntMediaClient.swift
+++ b/WebRTCiOSSDK/api/AntMediaClient.swift
@@ -23,39 +23,39 @@ public enum AntMediaClientMode: Int {
     
     func getLeaveMessage() -> String {
         switch self {
-            case .join:
-                return "leave"
-            case .publish, .play:
-                return "stop"
-            case .conference:
-                return "leaveRoom"
-            case .unspecified:
-                return "unspecified";
+        case .join:
+            return "leave"
+        case .publish, .play:
+            return "stop"
+        case .conference:
+            return "leaveRoom"
+        case .unspecified:
+            return "unspecified";
         }
     }
     
     func getName() -> String {
         switch self {
-            case .join:
-                return "join"
-            case .play:
-                return "play"
-            case .publish:
-                return "publish"
-            case .conference:
-                return "conference"
-            case .unspecified:
-                return "unspecified";
+        case .join:
+            return "join"
+        case .play:
+            return "play"
+        case .publish:
+            return "publish"
+        case .conference:
+            return "conference"
+        case .unspecified:
+            return "unspecified";
         }
     }
     
 }
 open class AntMediaClient: NSObject, AntMediaClientProtocol {
     
- 
+    
     internal static var isDebug: Bool = false
     public weak var delegate: AntMediaClientDelegate?
-
+    
     private var wsUrl: String!
     private var publisherStreamId: String? = nil;
     /**
@@ -72,11 +72,11 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
     var streamsInTheRoom:[String] = [];
     
     var roomInfoGetterTimer: Timer?;
-
-
+    
+    
     //private var webRTCClient: WebRTCClient?;
     private var webRTCClientMap: [String: WebRTCClient] = [:]
-
+    
     private var localView: RTCVideoRenderer?
     private var remoteView: RTCVideoRenderer?
     
@@ -84,7 +84,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
     
     private static let dispatchQueue = DispatchQueue(label: "audio")
     
-    private static let rtcAudioSession =  RTCAudioSession.sharedInstance()
+    static let rtcAudioSession =  RTCAudioSession.sharedInstance()
     
     private var localContainerBounds: CGRect?
     private var remoteContainerBounds: CGRect?
@@ -98,9 +98,9 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
     
     private var videoEnable: Bool = true
     private var audioEnable: Bool = true
-            
+    
     private var enableDataChannel: Bool = true
-        
+    
     //Screen capture of the app's screen.
     private var useExternalCameraSource: Bool = false
     
@@ -121,7 +121,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
     
     
     var reconnectIfRequiresScheduled: Bool = false;
-        
+    
     struct HandshakeMessage:Codable {
         var command:String?
         var streamId:String?
@@ -217,9 +217,9 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
     
     // Force speaker
     public static func speakerOn() {
-       
+        
         dispatchQueue.async {() in
-          
+            
             rtcAudioSession.lockForConfiguration()
             do {
                 try rtcAudioSession.overrideOutputAudioPort(.speaker)
@@ -244,10 +244,9 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
             rtcAudioSession.unlockForConfiguration()
         }
     }
-
+    
     
     open func start() {
-       
         initPeerConnection(streamId: self.getStreamId(), mode: self.mode, token: self.publishToken ?? (self.playToken ?? ""))
         if (!isWebSocketConnected) {
             connectWebSocket()
@@ -258,7 +257,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
     }
     
     /**
-    Join P2P call
+     Join P2P call
      */
     public func join(streamId:String)
     {
@@ -281,7 +280,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
             let leaveMessage =  [
                 COMMAND: "leave",
                 STREAM_ID: streamId] as [String : Any]
-        
+            
             webSocket?.write(string:leaveMessage.json)
         }
         self.webRTCClientMap.removeValue(forKey: streamId)?.disconnect();
@@ -290,7 +289,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
     public func joinRoom(roomId:String, streamId: String = "") {
         self.mainTrackId = roomId;
         self.publisherStreamId = streamId;
-        self.mode = AntMediaClientMode.conference;       
+        self.mode = AntMediaClientMode.conference;
         if (!isWebSocketConnected) {
             connectWebSocket()
         }
@@ -303,7 +302,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
             let jsonString =
             [ COMMAND: "getRoomInfo",
               ROOM_ID: roomId,
-              STREAM_ID: self.publisherStreamId ?? ""
+            STREAM_ID: self.publisherStreamId ?? ""
             ] as [String: Any]
             
             if (self.isWebSocketConnected) {
@@ -326,7 +325,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
             
             
         }
-       
+        
     }
     
     /**
@@ -378,7 +377,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
         webRTCConfiguration.mode = AVAudioSession.Mode.moviePlayback.rawValue
         webRTCConfiguration.category = AVAudioSession.Category.playback.rawValue
         webRTCConfiguration.categoryOptions = AVAudioSession.CategoryOptions.duckOthers
-                             
+        
         RTCAudioSessionConfiguration.setWebRTC(webRTCConfiguration)
     }
     
@@ -388,7 +387,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
     }
     
     public func publish(streamId: String, token: String = "", mainTrackId: String = "") {
-    
+        
         self.publisherStreamId = streamId;
         //reset default webrtc audio configuation to capture audio and mic
         resetDefaultWebRTCAudioConfiguation();
@@ -455,6 +454,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
                 self.webSocket?.delegate = self
                 self.webSocket?.connect()
                 
+                
             }
             else {
                 AntMediaClient.printf("WebSocket is already connected to: \(self.getWsUrl())")
@@ -483,7 +483,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
         let tmpStreamId = getStreamId(streamId)
         
         AntMediaClient.printf("Stop is called for \(tmpStreamId)")
-                            
+        
         if tmpStreamId == self.p2pStreamId
         {
             //provide backward compatibility
@@ -542,7 +542,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
     open func switchCamera() {
         self.webRTCClientMap[(self.publisherStreamId ?? (self.p2pStreamId)) ?? ""]?.switchCamera()
     }
-
+    
     /*
      Send data through WebRTC Data channel.
      */
@@ -551,20 +551,20 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
     }
     
     open func isDataChannelActive(streamId: String = "") -> Bool {
-       
+        
         return self.webRTCClientMap[getStreamId(streamId)]?.isDataChannelActive() ?? false
     }
-        
+    
     open func setLocalView( container: UIView, mode:UIView.ContentMode = .scaleAspectFit) {
-       
-        #if arch(arm64)
+        
+#if arch(arm64)
         let localRenderer = RTCMTLVideoView(frame: container.frame)
         localRenderer.videoContentMode =  mode
-        #else
+#else
         let localRenderer = RTCEAGLVideoView(frame: container.frame)
         localRenderer.delegate = self
-        #endif
- 
+#endif
+        
         localRenderer.frame = container.bounds
         self.localView = localRenderer
         self.localContainerBounds = container.bounds
@@ -573,14 +573,14 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
     }
     
     open func setRemoteView(remoteContainer: UIView, mode:UIView.ContentMode = .scaleAspectFit) {
-       
-        #if arch(arm64)
+        
+#if arch(arm64)
         let remoteRenderer = RTCMTLVideoView(frame: remoteContainer.frame)
         remoteRenderer.videoContentMode = mode
-        #else
+#else
         let remoteRenderer = RTCEAGLVideoView(frame: remoteContainer.frame)
         remoteRenderer.delegate = self
-        #endif
+#endif
         
         remoteRenderer.frame = remoteContainer.frame
         
@@ -618,7 +618,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
     }
     
     public static func setDebug(_ value: Bool) {
-         AntMediaClient.isDebug = value
+        AntMediaClient.isDebug = value
     }
     
     /*
@@ -630,19 +630,9 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
         if let audioEnabled = self.webRTCClientMap[self.publisherStreamId ?? (self.p2pStreamId ?? "")]?.isAudioEnabled() {
             self.sendAudioTrackStatusNotification(enabled: audioEnabled)
         }
-       
+        
     }
     
-    func sendAudioTrackStatusNotification(enabled:Bool)
-    {
-        var eventType = EVENT_TYPE_MIC_MUTED;
-        if (enabled) {
-            eventType = EVENT_TYPE_MIC_UNMUTED;
-        }
-        if let streamId = self.publisherStreamId {
-            self.sendNotification(eventType: eventType, streamId:streamId);
-        }
-    }
     /*
      Set publisher audio track
      */
@@ -651,46 +641,6 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
         self.sendAudioTrackStatusNotification(enabled:enableTrack);
     }
     
-    func sendNotification(eventType:String, streamId: String = "") {
-        let notification =  [
-            EVENT_TYPE: eventType,
-            STREAM_ID: self.getStreamId()].json;
-        
-        if let data = notification.data(using: .utf8) {
-            self.webRTCClientMap[self.publisherStreamId ?? (self.p2pStreamId ?? "")]?.sendData(data: data);
-        }
-       
-    }
-    
-    open func setMicMute( mute: Bool, completionHandler:@escaping(Bool, Error?)->Void)
-    {
-        AntMediaClient.dispatchQueue.async { () in
-           
-            AntMediaClient.rtcAudioSession.lockForConfiguration()
-            do {
-                var category:String;
-                if (mute) {
-                    category = AVAudioSession.Category.soloAmbient.rawValue;
-                }
-                else {
-                    category = AVAudioSession.Category.playAndRecord.rawValue;
-                }
-                try AntMediaClient.rtcAudioSession.setCategory(category);
-                //playAndRecord category defaults receiver to set to speaker
-                try AntMediaClient.rtcAudioSession.overrideOutputAudioPort(.speaker)
-                try AntMediaClient.rtcAudioSession.setActive(true);
-                self.webRTCClientMap[self.getPublisherStreamId()]?.setAudioEnabled(enabled: !mute);
-                self.sendNotification(eventType: mute ? EVENT_TYPE_MIC_MUTED : EVENT_TYPE_MIC_UNMUTED);
-                completionHandler(mute, nil);
-                
-            } catch let error {
-                AntMediaClient.printf("Couldn't set to mic status: \(error)")
-                completionHandler(mute, error);
-            }
-            AntMediaClient.rtcAudioSession.unlockForConfiguration()
-        }
-    }
-    
     open func toggleVideo() {
         self.webRTCClientMap[getPublisherStreamId()]?.toggleVideoEnabled()
         
@@ -699,16 +649,6 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
         }
     }
     
-    func sendVideoTrackStatusNotification(enabled:Bool) {
-        var eventType = EVENT_TYPE_CAM_TURNED_OFF;
-        if (enabled) {
-            eventType = EVENT_TYPE_CAM_TURNED_ON;
-        }
-        if let streamId = self.publisherStreamId {
-            self.sendNotification(eventType: eventType, streamId:streamId);
-        }
-    }
-    
     open func setVideoTrack(enableTrack: Bool)
     {
         self.webRTCClientMap[getPublisherStreamId()]?.setVideoEnabled(enabled: enableTrack);
@@ -798,11 +738,14 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
                 sendJoinCommand(streamId)
             }
         }
+        
+        self.setupAudioNotifications()
     }
     
     private func websocketDisconnected(message:String, code:UInt16) {
         self.delegate?.clientDidDisconnect(message)
         self.reconnectIfRequires()
+        self.removeAudioNotifications()
     }
     
     /**
@@ -812,11 +755,11 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
      `reconnectIfRequires` checks if connection is in the map because if the connection is stopped by the user, it's removed from the map, then there is nothing to do.
      If it's not removed from the map and its state is closed, disconnected or failed it means that is a reconnect scenario is required.
      
-    This method is also called after joining a room to check if it requires to reconnect
+     This method is also called after joining a room to check if it requires to reconnect
      
      */
     private func reconnectIfRequires() {
-       
+        
         if (self.reconnectIfRequiresScheduled) {
             AntMediaClient.printf("ReconnectIfRequires is already scheduled and it will work soon")
             return;
@@ -895,7 +838,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
     }
     
     private func onJoined() {
-
+        
     }
     
     
@@ -948,123 +891,130 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
     private func onCommand(_ command: String, message: [String: Any]) {
         
         switch command {
-            case "start":
-                //if this is called, it's publisher or initiator in p2p
-                let streamId = message[STREAM_ID] as! String
-                self.webRTCClientMap[streamId]?.createOffer()
-                break
-            case "stop":
-                let streamId = message[STREAM_ID] as! String
-                AntMediaClient.dispatchQueue.async {
-                    self.webRTCClientMap.removeValue(forKey: streamId)?.disconnect()
+        case "start":
+            //if this is called, it's publisher or initiator in p2p
+            let streamId = message[STREAM_ID] as! String
+            self.webRTCClientMap[streamId]?.createOffer()
+            break
+        case "stop":
+            let streamId = message[STREAM_ID] as! String
+            AntMediaClient.dispatchQueue.async {
+                self.webRTCClientMap.removeValue(forKey: streamId)?.disconnect()
+            }
+            break
+        case "takeConfiguration":
+            let streamId = message[STREAM_ID] as! String
+            self.onTakeConfiguration(message: message, streamId: streamId)
+            break
+        case "takeCandidate":
+            let streamId = message[STREAM_ID] as! String
+            self.onTakeCandidate(message: message, streamId: streamId)
+            break
+        case STREAM_INFORMATION_COMMAND:
+            AntMediaClient.printf("stream information command")
+            var streamInformations: [StreamInformation] = [];
+            
+            if let streamInformationArray = message["streamInfo"] as? [Any]
+            {
+                for result in streamInformationArray
+                {
+                    if let resultObject = result as? [String:Any]
+                    {
+                        streamInformations.append(StreamInformation(json: resultObject))
+                    }
                 }
-                break
-            case "takeConfiguration":
+            }
+            self.delegate?.streamInformation(streamInfo: streamInformations);
+            
+            break
+        case "notification":
+            guard let definition = message["definition"] as? String else {
+                return
+            }
+            
+            if definition == "joined" {
+                AntMediaClient.printf("Joined: Let's go")
+                self.onJoined()
+            }
+            else if definition == "play_started" {
+                let streamId = message[STREAM_ID] as! String
+                AntMediaClient.printf("Play started: Let's go")
+                self.delegate?.playStarted(streamId: streamId)
+            }
+            else if definition == "play_finished" {
+                AntMediaClient.printf("Playing has finished")
+                self.streamsInTheRoom.removeAll();
+                self.delegate?.playFinished(streamId: message[STREAM_ID] as! String)
+            }
+            else if definition == "publish_started" {
                 let streamId = message[STREAM_ID] as! String
-                self.onTakeConfiguration(message: message, streamId: streamId)
-                break
-            case "takeCandidate":
+                AntMediaClient.printf("Publish started: Let's go")
+                self.webRTCClientMap[streamId]?.setMaxVideoBps(maxVideoBps: self.maxVideoBps)
+                self.delegate?.publishStarted(streamId: message[STREAM_ID] as! String)
+            }
+            else if definition == "publish_finished" {
                 let streamId = message[STREAM_ID] as! String
-                self.onTakeCandidate(message: message, streamId: streamId)
-                break
-            case STREAM_INFORMATION_COMMAND:
-                AntMediaClient.printf("stream information command")
-                var streamInformations: [StreamInformation] = [];
-                
-                if let streamInformationArray = message["streamInfo"] as? [Any]
+                AntMediaClient.printf("Publish finished: Let's close")
+                self.delegate?.publishFinished(streamId: streamId)
+            }
+            else if definition == JOINED_ROOM_DEFINITION
+            {
+                let streamId = message[STREAM_ID] as! String;
+                let streams = message[STREAMS] as! [String];
+                self.joinedRoom(streamId: streamId, streams:streams);
+            }
+            else if definition == BROADCAST_OBJECT_NOTIFICATION { // broadcastObject
+                let broadcastString = message["broadcast"] as! String
+                let broadcastObject = broadcastString.toJSON()
+                self.delegate?.onLoadBroadcastObject(
+                    streamId: message[STREAM_ID] as! String,
+                    message: broadcastObject ?? [:]
+                )
+            }
+            
+            break;
+        case ROOM_INFORMATION_COMMAND:
+            if let updatedStreamsInTheRoom = message[STREAMS] as? [String] {
+                //check that there is a new stream exists
+                var newStreams:[String] = []
+                var leftStreams: [String] = []
+                for stream in updatedStreamsInTheRoom
                 {
-                    for result in streamInformationArray
-                    {
-                        if let resultObject = result as? [String:Any]
-                        {
-                            streamInformations.append(StreamInformation(json: resultObject))
-                        }
+                    // AntMedia.printf("stream in updatestreamInTheRoom \(stream)")
+                    if (!self.streamsInTheRoom.contains(stream)) {
+                        newStreams.append(stream)
                     }
                 }
-                self.delegate?.streamInformation(streamInfo: streamInformations);
-                
-                break
-            case "notification":
-                guard let definition = message["definition"] as? String else {
-                    return
+                //check that any stream is left
+                for stream in self.streamsInTheRoom {
+                    if (!updatedStreamsInTheRoom.contains(stream)) {
+                        leftStreams.append(stream)
+                    }
                 }
                 
-                if definition == "joined" {
-                    AntMediaClient.printf("Joined: Let's go")
-                    self.onJoined()
-                }
-                else if definition == "play_started" {
-                    let streamId = message[STREAM_ID] as! String
-                    AntMediaClient.printf("Play started: Let's go")
-                    self.delegate?.playStarted(streamId: streamId)
-                }
-                else if definition == "play_finished" {
-                    AntMediaClient.printf("Playing has finished")
-                    self.streamsInTheRoom.removeAll();
-                    self.delegate?.playFinished(streamId: message[STREAM_ID] as! String)
-                }
-                else if definition == "publish_started" {
-                    let streamId = message[STREAM_ID] as! String
-                    AntMediaClient.printf("Publish started: Let's go")
-                    self.webRTCClientMap[streamId]?.setMaxVideoBps(maxVideoBps: self.maxVideoBps)
-                    self.delegate?.publishStarted(streamId: message[STREAM_ID] as! String)
-                }
-                else if definition == "publish_finished" {
-                    let streamId = message[STREAM_ID] as! String
-                    AntMediaClient.printf("Publish finished: Let's close")
-                    self.delegate?.publishFinished(streamId: streamId)
-                }
-                else if definition == JOINED_ROOM_DEFINITION
-                {
-                    let streamId = message[STREAM_ID] as! String;
-                    let streams = message[STREAMS] as! [String];
-                    self.joinedRoom(streamId: streamId, streams:streams);
-                }
-            
-                break;
-            case ROOM_INFORMATION_COMMAND:
-                if let updatedStreamsInTheRoom = message[STREAMS] as? [String] {
-                   //check that there is a new stream exists
-                    var newStreams:[String] = []
-                    var leftStreams: [String] = []
-                    for stream in updatedStreamsInTheRoom
-                    {
-                       // AntMedia.printf("stream in updatestreamInTheRoom \(stream)")
-                        if (!self.streamsInTheRoom.contains(stream)) {
-                            newStreams.append(stream)
-                        }
-                    }
-                    //check that any stream is left
-                   for stream in self.streamsInTheRoom {
-                       if (!updatedStreamsInTheRoom.contains(stream)) {
-                           leftStreams.append(stream)
-                       }
-                   }
-                    
-                    self.streamsInTheRoom = updatedStreamsInTheRoom
-                    
-                    if (newStreams.count > 0) {
-                        self.delegate?.newStreamsJoined(streams: newStreams)
-                    }
-                    
-                    if (leftStreams.count > 0) {
-                        self.delegate?.streamsLeft(streams: leftStreams)
-                    }
-                            
+                self.streamsInTheRoom = updatedStreamsInTheRoom
+                
+                if (newStreams.count > 0) {
+                    self.delegate?.newStreamsJoined(streams: newStreams)
                 }
                 
-                break;
-            case "error":
-                guard let definition = message["definition"] as? String else {
-                    self.delegate?.clientHasError("An error occured, please try again")
-                    return
+                if (leftStreams.count > 0) {
+                    self.delegate?.streamsLeft(streams: leftStreams)
                 }
                 
-                self.delegate?.clientHasError(AntMediaError.localized(definition))
-                break
-            default:
-                AntMediaClient.printf("Unknown message received -> \(message)");
-                break
+            }
+            break;
+        case "error":
+            guard let definition = message["definition"] as? String else {
+                self.delegate?.clientHasError("An error occured, please try again")
+                return
+            }
+            
+            self.delegate?.clientHasError(AntMediaError.localized(definition))
+            break
+        default:
+            AntMediaClient.printf("Unknown message received -> \(message)");
+            break
         }
     }
     
@@ -1074,9 +1024,9 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
         return request
     }
     
-    public static func printf(_ msg: String) {
+    public static func printf(_ msg: Any) {
         if (AntMediaClient.isDebug) {
-            debugPrint("--> AntMediaSDK: " + msg)
+            debugPrint("--> AntMediaSDK: ", msg)
         }
     }
     
@@ -1106,6 +1056,15 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
         self.webRTCClientMap[self.getStreamId(streamId)]?.getStats(handler: completionHandler)
     }
     
+    public func getStatistics(
+        for streamId: String = "",
+        completion: @escaping (ClientStatistics) -> Void
+    ) {
+        getStats(completionHandler: { report in
+            completion(.init(items: report.statistics.extractRTCStatItems()))
+        }, streamId: streamId)
+    }
+    
     public func deliverExternalAudio(sampleBuffer: CMSampleBuffer)
     {
         self.webRTCClientMap[getPublisherStreamId()]?.deliverExternalAudio(sampleBuffer: sampleBuffer);
@@ -1129,7 +1088,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
         (self.webRTCClientMap[self.getPublisherStreamId()]?.getVideoCapturer() as? RTCCustomFrameCapturer)?.capture(pixelBuffer, rotation: rotation, timeStampNs: timestampNs);
     }
     
-
+    
     public func enableVideoTrack(trackId:String, enabled:Bool){
         if (isWebSocketConnected) {
             
@@ -1172,22 +1131,115 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
         }
     }
     
+    /**
+     * Degradation preference in case of CPU adaptation or constrained bandwidth.
+     * If nil, implementation default degradation preference will be used.
+     */
+    public func setDegregationPreferences(_ degradationPreference: RTCDegradationPreference, streamId: String? = nil) {
+        let rtc = self.webRTCClientMap[streamId ?? self.getPublisherStreamId()]
+        
+        guard let params = rtc?.videoSender?.parameters else {
+            return
+        }
+        
+        params.degradationPreference = degradationPreference.rawValue
+        rtc?.videoSender?.parameters = params
+    }
+    
     public func disconnect() {
         for (streamId, webrtcClient) in self.webRTCClientMap {
             webrtcClient.disconnect()
         }
-             
+        
         self.webRTCClientMap.removeAll();
         self.webSocket?.disconnect();
         self.webSocket = nil;
         
     }
     
+    // MARK: - Notifications
+    open func setMicMute( mute: Bool, completionHandler:@escaping(Bool, Error?)->Void)
+    {
+        AntMediaClient.dispatchQueue.async { () in
+            
+            AntMediaClient.rtcAudioSession.lockForConfiguration()
+            do {
+                var category:String;
+                if (mute) {
+                    category = AVAudioSession.Category.soloAmbient.rawValue;
+                }
+                else {
+                    category = AVAudioSession.Category.playAndRecord.rawValue;
+                }
+                try AntMediaClient.rtcAudioSession.setCategory(category);
+                //playAndRecord category defaults receiver to set to speaker
+                try AntMediaClient.rtcAudioSession.overrideOutputAudioPort(.speaker)
+                try AntMediaClient.rtcAudioSession.setActive(true);
+                self.webRTCClientMap[self.getPublisherStreamId()]?.setAudioEnabled(enabled: !mute);
+                self.sendNotification(eventType: mute ? EVENT_TYPE_MIC_MUTED : EVENT_TYPE_MIC_UNMUTED);
+                completionHandler(mute, nil);
+                
+            } catch let error {
+                AntMediaClient.printf("Couldn't set to mic status: \(error)")
+                completionHandler(mute, error);
+            }
+            AntMediaClient.rtcAudioSession.unlockForConfiguration()
+        }
+    }
+    
+    func sendNotification(eventType:String, streamId: String = "") {
+        let notification =  [
+            EVENT_TYPE: eventType,
+            STREAM_ID: self.getStreamId()].json;
+        
+        if let data = notification.data(using: .utf8) {
+            self.webRTCClientMap[self.publisherStreamId ?? (self.p2pStreamId ?? "")]?.sendData(data: data);
+        }
+        
+    }
+    
+    func sendCommand(command: String, streamId: String) {
+        let command =  [
+            COMMAND: command,
+            STREAM_ID: self.getStreamId()
+        ].json;
+        
+        webSocket?.write(string: command)
+    }
+    
+    func sendAudioTrackStatusNotification(enabled:Bool)
+    {
+        var eventType = EVENT_TYPE_MIC_MUTED;
+        if (enabled) {
+            eventType = EVENT_TYPE_MIC_UNMUTED;
+        }
+        if let streamId = self.publisherStreamId {
+            self.sendNotification(eventType: eventType, streamId:streamId);
+        }
+    }
+    
+    func sendVideoTrackStatusNotification(enabled:Bool) {
+        var eventType = EVENT_TYPE_CAM_TURNED_OFF;
+        if (enabled) {
+            eventType = EVENT_TYPE_CAM_TURNED_ON;
+        }
+        if let streamId = self.publisherStreamId {
+            self.sendNotification(eventType: eventType, streamId:streamId);
+        }
+    }
+    
+    public func getBroadcastObject(forStreamId id: String) {
+        AntMediaClient.printf("GetBroadcastObject for \(id)")
+        sendCommand(
+            command: GET_BROADCAST_OBJECT_COMMAND,
+            streamId: id
+        )
+    }
 }
 
 extension AntMediaClient: WebRTCClientDelegate {
-
-        
+    
+    
     func trackAdded(track: RTCMediaStreamTrack, stream: [RTCMediaStream]) {
         self.delegate?.trackAdded(track: track, stream: stream)
     }
@@ -1239,14 +1291,25 @@ extension AntMediaClient: WebRTCClientDelegate {
         
         let rawJSON = String(decoding: data.data, as: UTF8.self)
         let json = rawJSON.toJSON();
-      
+        
         if let eventType = json?[EVENT_TYPE] {
             //event happened
             if let incomingStreamId = json?[STREAM_ID] {
-                self.delegate?.eventHappened(streamId:incomingStreamId as! String , eventType:eventType as! String);
+                self.delegate?.eventHappened(
+                    streamId: incomingStreamId as! String,
+                    eventType: eventType as! String
+                )
+                
+                self.delegate?.eventHappened(
+                    streamId: incomingStreamId as! String,
+                    eventType: eventType as! String,
+                    payload: json
+                )
             }
             else {
-                AntMediaClient.printf("Incoming message does not have streamId:\(json)")
+                AntMediaClient.printf(
+                    "Incoming message does not have streamId:\(String(describing: json))"
+                )
             }
         }
         else {
@@ -1257,15 +1320,7 @@ extension AntMediaClient: WebRTCClientDelegate {
 }
 
 extension AntMediaClient: WebSocketDelegate {
-   
-    
-    
-    
-    public func getPingMessage() -> [String: String] {
-        return [COMMAND: "ping"]
-    }
-    
-    public func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocketClient) {
+    public func didReceive(event: Starscream.WebSocketEvent, client: any Starscream.WebSocketClient) {
         switch event {
         case .connected(let headers):
             isWebSocketConnected = true;
@@ -1284,7 +1339,7 @@ extension AntMediaClient: WebSocketDelegate {
             AntMediaClient.printf("websocket is disconnected: \(reason) with code: \(code)")
             pingTimer?.invalidate()
             self.websocketDisconnected(message:reason, code:code)
-          
+            
             break;
         case .text(let string):
             //AntMediaClient.printf("Received text: \(string)");
@@ -1305,7 +1360,7 @@ extension AntMediaClient: WebSocketDelegate {
             isWebSocketConnected = false;
             pingTimer?.invalidate()
             webSocket?.disconnect();
-           
+            
             AntMediaClient.printf("Websocket is cancelled");
             break;
         case .error(let error):
@@ -1320,15 +1375,17 @@ extension AntMediaClient: WebSocketDelegate {
             break;
         }
     }
+    
+    public func getPingMessage() -> [String: String] {
+        return [COMMAND: "ping"]
+    }
 }
 
 extension AntMediaClient: RTCAudioSessionDelegate
 {
-    
     public func audioSessionDidStartPlayOrRecord(_ session: RTCAudioSession) {
         self.delegate?.audioSessionDidStartPlayOrRecord(streamId: self.getStreamId())
     }
-
 }
 
 /*
@@ -1337,13 +1394,13 @@ extension AntMediaClient: RTCAudioSessionDelegate
 extension AntMediaClient: RTCVideoViewDelegate {
     
     private func resizeVideoFrame(bounds: CGRect, size: CGSize, videoView: UIView) {
-    
+        
         let defaultAspectRatio: CGSize = CGSize(width: size.width, height: size.height)
-    
+        
         let videoFrame: CGRect = AVMakeRect(aspectRatio: defaultAspectRatio, insideRect: bounds)
-    
+        
         videoView.bounds = videoFrame
-    
+        
     }
     
     public func videoView(_ videoView: RTCVideoRenderer, didChangeVideoSize size: CGSize) {
@@ -1359,7 +1416,7 @@ extension AntMediaClient: RTCVideoViewDelegate {
         {
             bounds = self.remoteContainerBounds ?? nil
         }
-       
+        
         if (bounds != nil)
         {
             resizeVideoFrame(bounds: bounds!, size: size, videoView: (videoView as? UIView)!)
diff --git a/WebRTCiOSSDK/api/AntMediaClientDelegate.swift b/WebRTCiOSSDK/api/AntMediaClientDelegate.swift
index 5e4b15a..67f8799 100644
--- a/WebRTCiOSSDK/api/AntMediaClientDelegate.swift
+++ b/WebRTCiOSSDK/api/AntMediaClientDelegate.swift
@@ -120,8 +120,11 @@ public protocol AntMediaClientDelegate: AnyObject {
      - streamId: The id of the stream that the event happened
      - evenType: The type of the event
      */
+    @available(*, deprecated, message: "Will be removed soon")
     func eventHappened(streamId:String, eventType:String);
     
+    func eventHappened(streamId:String, eventType:String, payload: [String:Any]?)
+    
     /**
      It's called when a new track is added to the stream. It works both on multirack streaming and conferencing
      */
@@ -153,16 +156,25 @@ public protocol AntMediaClientDelegate: AnyObject {
     @available(*, deprecated, message: "No need to use. New streams are removed automatically. trackRemoved is called automatically")
     func streamsLeft(streams: [String]);
     
+    func onLoadBroadcastObject(streamId: String, message: [String: Any])
 }
 
 public extension AntMediaClientDelegate {
+    func onLoadBroadcastObject(streamId: String, message: [String: Any]) {
+        
+    }
+    
+    func eventHappened(streamId:String, eventType:String, payload: [String:Any]?) {
+        AntMediaClient.printf("\(streamId) \(eventType) with")
+        AntMediaClient.printf(payload ?? [:])
+    }
     
     func clientDidConnect(_ client: AntMediaClient) {
         AntMediaClient.printf("Websocket is connected for \(client.getStreamId())")
     }
         
     func eventHappened(streamId: String, eventType: String) {
-        AntMediaClient.printf("Event: \(eventType) happened in stream: \(streamId) ")
+        // Deprecated
     }
     
     func clientDidDisconnect(_ message: String) {
diff --git a/WebRTCiOSSDK/api/AntMediaClientProtocol.swift b/WebRTCiOSSDK/api/AntMediaClientProtocol.swift
index 0617909..12ba614 100644
--- a/WebRTCiOSSDK/api/AntMediaClientProtocol.swift
+++ b/WebRTCiOSSDK/api/AntMediaClientProtocol.swift
@@ -29,11 +29,16 @@ let GET_STREAM_INFO_COMMAND = "getStreamInfo";
 let STREAM_INFORMATION_COMMAND = "streamInformation";
 let FORCE_STREAM_QUALITY_INFO = "forceStreamQuality";
 let STREAM_HEIGHT_FIELD = "streamHeight";
+let GET_BROADCAST_OBJECT_COMMAND = "getBroadcastObject"
+let BROADCAST_OBJECT_NOTIFICATION = "broadcastObject"
+
 let EVENT_TYPE = "eventType";
 let EVENT_TYPE_MIC_MUTED = "MIC_MUTED"
 let EVENT_TYPE_MIC_UNMUTED = "MIC_UNMUTED";
 let EVENT_TYPE_CAM_TURNED_OFF = "CAM_TURNED_OFF";
 let EVENT_TYPE_CAM_TURNED_ON = "CAM_TURNED_ON";
+let EVENT_TYPE_TRACK_LIST_UPDATED = "TRACK_LIST_UPDATED"
+
 
 let ENABLE_TRACK_COMMAND = "enableTrack"
 let ENABLE_VIDEO_TRACK_COMMAND = "toggleVideo"
diff --git a/WebRTCiOSSDK/api/ConferenceClient.swift b/WebRTCiOSSDK/api/ConferenceClient.swift
index 279fc1c..6fa2c58 100644
--- a/WebRTCiOSSDK/api/ConferenceClient.swift
+++ b/WebRTCiOSSDK/api/ConferenceClient.swift
@@ -51,6 +51,10 @@ public protocol ConferenceClientDelegate: AnyObject
 @available(*, deprecated, message: "Use AntMediaClient directly and take a look at the sample")
 open class ConferenceClient: ConferenceClientProtocol, WebSocketDelegate
 {
+    public func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocket) {
+        // on receive client 
+    }
+    
     var serverURL: String;
     var webSocket: WebSocket;
     var roomId: String!;
diff --git a/WebRTCiOSSDK/api/webrtc/NetworkQuality.swift b/WebRTCiOSSDK/api/webrtc/NetworkQuality.swift
new file mode 100644
index 0000000..c6a5531
--- /dev/null
+++ b/WebRTCiOSSDK/api/webrtc/NetworkQuality.swift
@@ -0,0 +1,89 @@
+//
+//  NetworkQuality.swift
+//  WebRTCiOSSDK
+//
+//  Created by applebro on 30/04/24.
+//
+
+import Foundation
+import Foundation
+import Network
+
+protocol NetworkQualityMonitorDelegate: AnyObject {
+    func didDetectNetworkQualityChange(_ networkQuality: NetworkQuality)
+}
+
+enum NetworkQuality {
+    case good
+    case poor
+}
+
+class NetworkQualityMonitor {
+    weak var delegate: NetworkQualityMonitorDelegate?
+    
+    // Known server to ping for latency measurement
+    let host = "example.com"
+    let port = 80 // HTTP port
+
+    init() {
+        // Start monitoring
+        let queue = DispatchQueue(label: "NetworkMonitor")
+        queue.async { [weak self] in
+            self?.startMonitoring()
+        }
+    }
+
+    private func startMonitoring() {
+        while true {
+            let pingTime = pingHost()
+            let networkQuality = evaluateNetworkQuality(pingTime: pingTime)
+            delegate?.didDetectNetworkQualityChange(networkQuality)
+            // Wait for some time before next ping
+            sleep(5)
+        }
+    }
+
+    private func pingHost() -> TimeInterval {
+        var timeInterval: TimeInterval = -1
+        let semaphore = DispatchSemaphore(value: 0)
+        
+        let host = NWEndpoint.Host(host)
+        
+        guard let port = NWEndpoint.Port(rawValue: UInt16(port)) else {
+            return timeInterval
+        }
+
+        let endpoint = NWEndpoint.hostPort(host: host, port: port)
+        let connection = NWConnection(to: endpoint, using: .tcp)
+        
+        connection.stateUpdateHandler = { state in
+            switch state {
+            case .ready:
+                let startTime = CFAbsoluteTimeGetCurrent()
+                connection.send(content: nil, completion: .contentProcessed { _ in
+                    timeInterval = CFAbsoluteTimeGetCurrent() - startTime
+                    semaphore.signal()
+                })
+            case .failed(let error):
+                print("Connection failed with error: \(error)")
+                semaphore.signal()
+            default:
+                break
+            }
+        }
+        
+        connection.start(queue: DispatchQueue.global())
+        semaphore.wait()
+        connection.cancel()
+
+        return timeInterval
+    }
+
+    private func evaluateNetworkQuality(pingTime: TimeInterval) -> NetworkQuality {
+        if pingTime >= 0 && pingTime <= 0.2 { // Assuming 200ms as threshold for good quality
+            return .good
+        } else {
+            return .poor
+        }
+    }
+}
diff --git a/WebRTCiOSSDK/api/webrtc/RTCCustomFrameCapturer.swift b/WebRTCiOSSDK/api/webrtc/RTCCustomFrameCapturer.swift
index 99007ca..394df1f 100644
--- a/WebRTCiOSSDK/api/webrtc/RTCCustomFrameCapturer.swift
+++ b/WebRTCiOSSDK/api/webrtc/RTCCustomFrameCapturer.swift
@@ -58,16 +58,33 @@ class RTCCustomFrameCapturer: RTCVideoCapturer {
             return;
             
         }
+        
+        let width = Int32(CVPixelBufferGetWidth(pixelBuffer))
+        let height = Int32(CVPixelBufferGetHeight(pixelBuffer))
+        
+        var scaledWidth = (width * Int32(self.targetHeight)) / height;
+        if (scaledWidth % 2 == 1) {
+            scaledWidth+=1;
+        }
+        
         let rtcPixelBuffer = RTCCVPixelBuffer(
-            pixelBuffer: pixelBuffer)
-                
-        let rtcVideoFrame = RTCVideoFrame(buffer: rtcPixelBuffer,
-                                          
-                                          rotation: rotation, timeStampNs: Int64(timeStampNs))
+            pixelBuffer: pixelBuffer,
+            adaptedWidth:scaledWidth,
+            adaptedHeight: Int32(self.targetHeight),
+            cropWidth: width,
+            cropHeight: height,
+            cropX: 0,
+            cropY: 0)
+        
+        let rtcVideoFrame = RTCVideoFrame(
+            buffer: rtcPixelBuffer,
+            rotation: rotation, 
+            timeStampNs: Int64(timeStampNs)
+        )
         
         self.delegate?.capturer(self, didCapture: rtcVideoFrame.newI420())
+        lastSentFrameTimeStampNanoSeconds = Int64(timeStampNs);
         lastSentFrameTimeStampNanoSeconds = timeStampNs;
-        
     }
     
     public func capture(_ sampleBuffer: CMSampleBuffer, externalRotation:Int = -1) {
diff --git a/WebRTCiOSSDK/api/webrtc/WebRTCClient.swift b/WebRTCiOSSDK/api/webrtc/WebRTCClient.swift
index a7abe3b..9be6be4 100644
--- a/WebRTCiOSSDK/api/webrtc/WebRTCClient.swift
+++ b/WebRTCiOSSDK/api/webrtc/WebRTCClient.swift
@@ -60,6 +60,9 @@ class WebRTCClient: NSObject {
      State of the connection
      */
     var iceConnectionState:RTCIceConnectionState = .new;
+    
+    private var lastReport: RTCStatisticsReport?
+    private var isGeneratingReport: Bool = false
         
     public init(remoteVideoView: RTCVideoRenderer?, localVideoView: RTCVideoRenderer?, delegate: WebRTCClientDelegate, externalAudio:Bool) {
         super.init()
@@ -136,9 +139,21 @@ class WebRTCClient: NSObject {
     }
     
     public func getStats(handler: @escaping (RTCStatisticsReport) -> Void) {
+        if isGeneratingReport, let lastReport {
+            handler(lastReport)
+            return
+        }
         
-        
-        self.peerConnection?.statistics(completionHandler: handler);
+        isGeneratingReport = true
+        self.peerConnection?.statistics(completionHandler: { [weak self] report in
+            guard let self else {
+                return
+            }
+            
+            self.lastReport = report
+            self.isGeneratingReport = false
+            handler(report)
+        });
     }
     
     public func setStreamId(_ streamId: String) {
@@ -190,16 +205,20 @@ class WebRTCClient: NSObject {
                     var answerDict = [String: Any]()
                     
                     if (self.token.isEmpty) {
-                        answerDict =  ["type": "answer",
-                                       "command": "takeConfiguration",
-                                       "sdp": sdp!.sdp,
-                                       "streamId": self.streamId!] as [String : Any]
+                        answerDict =  [
+                            "type": "answer",
+                            "command": "takeConfiguration",
+                            "sdp": sdp!.sdp,
+                            "streamId": self.streamId!
+                        ] as [String : Any]
                     } else {
-                        answerDict =  ["type": "answer",
-                                       "command": "takeConfiguration",
-                                       "sdp": sdp!.sdp,
-                                       "streamId": self.streamId!,
-                                       "token": self.token] as [String : Any]
+                        answerDict =  [
+                            "type": "answer",
+                            "command": "takeConfiguration",
+                            "sdp": sdp!.sdp,
+                            "streamId": self.streamId!,
+                            "token": self.token ?? ""
+                        ] as [String : Any]
                     }
                     
                     self.delegate?.sendMessage(answerDict)
@@ -327,7 +346,7 @@ class WebRTCClient: NSObject {
         return iceConnectionState;
     }
     
-    
+    @discardableResult
     private func startCapture() -> Bool {
         
          let camera = (RTCCameraVideoCapturer.captureDevices().first { $0.position == self.cameraPosition })
@@ -360,9 +379,11 @@ class WebRTCClient: NSObject {
                 
                 let cameraVideoCapturer = self.videoCapturer as? RTCCameraVideoCapturer;
                 
-                cameraVideoCapturer?.startCapture(with: camera!,
-                                                  format: selectedFormat!,
-                                                  fps: Int(fps))
+                cameraVideoCapturer?.startCapture(
+                    with: camera!,
+                    format: selectedFormat!,
+                    fps: Int(fps)
+                )
                 
                 return true
             }
@@ -375,7 +396,6 @@ class WebRTCClient: NSObject {
         }
     
         return false;
-        
     }
     
     private func createVideoTrack() -> RTCVideoTrack?  {
@@ -384,11 +404,26 @@ class WebRTCClient: NSObject {
         {
             //try with screencast video source
             let videoSource = WebRTCClient.factory.videoSource(forScreenCast: true)
-            self.videoCapturer = RTCCustomFrameCapturer.init(delegate: videoSource, height: targetHeight, externalCapture: externalVideoCapture, videoEnabled: videoEnabled, audioEnabled: externalAudio, fps:self.cameraSourceFPS);
+            self.videoCapturer = RTCCustomFrameCapturer.init(
+                delegate: videoSource,
+                height: targetHeight,
+                externalCapture: externalVideoCapture,
+                videoEnabled: videoEnabled,
+                audioEnabled: externalAudio,
+                fps:self.cameraSourceFPS
+            );
+            
+            (self.videoCapturer as? RTCCustomFrameCapturer)?
+                .setWebRTCClient(webRTCClient: self);
+            
+            (self.videoCapturer as? RTCCustomFrameCapturer)?
+                .startCapture()
+            
+            let videoTrack = WebRTCClient.factory.videoTrack(
+                with: videoSource,
+                trackId: "video0"
+            )
             
-            (self.videoCapturer as? RTCCustomFrameCapturer)?.setWebRTCClient(webRTCClient: self);
-            (self.videoCapturer as? RTCCustomFrameCapturer)?.startCapture()
-            let videoTrack = WebRTCClient.factory.videoTrack(with: videoSource, trackId: "video0")
             return videoTrack
         }
         else {
@@ -402,7 +437,10 @@ class WebRTCClient: NSObject {
                 return nil;
             }
             #endif
-            let videoTrack = WebRTCClient.factory.videoTrack(with: videoSource, trackId: "video0")
+            let videoTrack = WebRTCClient.factory.videoTrack(
+                with: videoSource,
+                trackId: "video0"
+            )
             return videoTrack
         }
         
@@ -416,7 +454,7 @@ class WebRTCClient: NSObject {
         if (self.videoEnabled)
         {
             self.localVideoTrack = createVideoTrack();
-
+            
             self.videoSender = self.peerConnection?.add(self.localVideoTrack,  streamIds: [LOCAL_MEDIA_STREAM_ID])
         }
             
@@ -588,3 +626,10 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
         //AntMediaClient.printf("---> didRemove")
     }
 }
+
+public enum RTCDegradationPreference: NSNumber {
+    case disabled = 0
+    case maintainFramerate = 1
+    case maintainResolution = 2
+    case balanced = 3
+}
diff --git a/WebRTCiOSSDK/extensions/Dictionary+Extensions.swift b/WebRTCiOSSDK/extensions/Dictionary+Extensions.swift
new file mode 100644
index 0000000..e05858c
--- /dev/null
+++ b/WebRTCiOSSDK/extensions/Dictionary+Extensions.swift
@@ -0,0 +1,35 @@
+//
+//  Dictionary+Extensions.swift
+//  WebRTCiOSSDK
+//
+//  Created by applebro on 30/03/24.
+//
+
+import Foundation
+import WebRTC
+
+extension Dictionary where Key == String, Value == RTCStatistics {
+    func extractRTCStatItems() -> [RTCStatItem] {
+        var extractedItems: [RTCStatItem] = []
+
+        // Iterate through the dictionary
+        for (key, object) in self {
+            // Extract values from each object
+            let id = object.id
+            let type = object.type
+            let timestamp = object.timestamp_us
+            let item = RTCStatItem(
+                id: id,
+                key: key,
+                type: RTCStatType(rawValue: type) ?? .unknown,
+                timestamp: timestamp,
+                values: object.values
+            )
+            // Append the RTCStatItem to the array
+            extractedItems.append(item)
+        }
+
+        return extractedItems
+    }
+}
+
diff --git a/WebRTCiOSSDK/utils/ClientStatistics.swift b/WebRTCiOSSDK/utils/ClientStatistics.swift
new file mode 100644
index 0000000..f8693db
--- /dev/null
+++ b/WebRTCiOSSDK/utils/ClientStatistics.swift
@@ -0,0 +1,50 @@
+//
+//  ClientStatistics.swift
+//  WebRTCiOSSDK
+//
+//  Created by applebro on 30/03/24.
+//
+
+import Foundation
+import WebRTC
+
+public enum RTCStatType: String {
+    case track = "track"
+    case candidate_pair = "candidate-pair"
+    case remote_candidate = "remote-candidate"
+    case local_candidate = "local-candidate"
+    case media_source = "media-source"
+    case stream = "stream"
+    case remote_inbound_rtp = "remote-inbound-rtp"
+    case outbound_rtp = "outbound-rtp"
+    case transport = "transport"
+    case certificate = "certificate"
+    case data_channel = "data-channel"
+    case peer_connection = "peer-connection"
+    case codec = "codec"
+    case unknown
+}
+
+public struct RTCStatItem {
+    public var id: String
+    public var key: String
+    public var type: RTCStatType
+    public var timestamp: CFTimeInterval
+    public var values: [String: NSObject]
+}
+
+public struct ClientStatistics {
+    public private(set) var items: [RTCStatItem]
+    
+    public var audioSource: RTCStatItem? {
+        items.first(where: {$0.type == .media_source && $0.values["kind"] as? String == "audio"})
+    }
+    
+    public var videoSource: RTCStatItem? {
+        items.first(where: {$0.type == .media_source && $0.values["kind"] as? String == "video"})
+    }
+    
+    public var audioLevel: Double {
+        audioSource?.values["audioLevel"] as? Double ?? 0
+    }
+}