diff --git a/WebRTC-Sample-App/Base.lproj/Main.storyboard b/WebRTC-Sample-App/Base.lproj/Main.storyboard
index 483a81a..9796ef7 100644
--- a/WebRTC-Sample-App/Base.lproj/Main.storyboard
+++ b/WebRTC-Sample-App/Base.lproj/Main.storyboard
@@ -1,11 +1,12 @@
 <?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="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="collection view cell content view" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -168,27 +169,48 @@ 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"/>
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="v8Q-eO-C1v">
+                                <rect key="frame" x="0.0" y="0.0" width="390" height="834"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <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"/>
-                                <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"/>
-                                <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"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                            </view>
+                                <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="2Nz-ci-6za">
+                                    <size key="itemSize" width="272" height="256"/>
+                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                </collectionViewFlowLayout>
+                                <cells>
+                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="playerCell" id="J7e-Mg-61f" customClass="CellView" customModule="WebRTC_Sample_App" customModuleProvider="target">
+                                        <rect key="frame" x="59" y="0.0" width="272" height="256"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="uPH-qA-2vf">
+                                            <rect key="frame" x="0.0" y="0.0" width="272" height="256"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="R5H-io-ymV" customClass="RTCMTLVideoView">
+                                                    <rect key="frame" x="0.0" y="0.0" width="272" height="256"/>
+                                                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                                </view>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="R5H-io-ymV" firstAttribute="top" secondItem="uPH-qA-2vf" secondAttribute="top" id="Bzy-hV-kM4"/>
+                                                <constraint firstAttribute="trailing" secondItem="R5H-io-ymV" secondAttribute="trailing" id="Hho-93-tzM"/>
+                                                <constraint firstItem="R5H-io-ymV" firstAttribute="leading" secondItem="uPH-qA-2vf" secondAttribute="leading" id="N5p-vv-z77"/>
+                                                <constraint firstAttribute="bottom" secondItem="R5H-io-ymV" secondAttribute="bottom" id="hYm-6e-Ujt"/>
+                                            </constraints>
+                                        </collectionViewCellContentView>
+                                        <size key="customSize" width="272" height="256"/>
+                                        <connections>
+                                            <outlet property="playerView" destination="R5H-io-ymV" id="Akp-w5-wvC"/>
+                                        </connections>
+                                    </collectionViewCell>
+                                </cells>
+                            </collectionView>
                             <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"/>
@@ -199,56 +221,34 @@ WebRTC Live Streaming</string>
                         <viewLayoutGuide key="safeArea" id="dqn-Tz-Jj5"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstAttribute="trailingMargin" secondItem="LXN-aK-Wm3" secondAttribute="trailing" constant="-17" id="3Bd-dA-tuF" userLabel="trailingMargin = Remote View3.trailing"/>
-                            <constraint firstItem="dqn-Tz-Jj5" firstAttribute="centerY" secondItem="zBK-Om-nWf" secondAttribute="bottom" id="4hl-T0-KDm"/>
-                            <constraint firstItem="PKz-rN-me0" firstAttribute="leading" secondItem="zBK-Om-nWf" secondAttribute="trailing" id="5Dx-Cr-rqG"/>
-                            <constraint firstItem="zBK-Om-nWf" firstAttribute="top" secondItem="dqn-Tz-Jj5" secondAttribute="top" id="6wq-5e-Mj6"/>
-                            <constraint firstItem="PKz-rN-me0" firstAttribute="top" secondItem="zBK-Om-nWf" secondAttribute="top" id="AqV-nA-EmJ"/>
-                            <constraint firstAttribute="centerX" secondItem="zBK-Om-nWf" secondAttribute="trailing" id="E4k-YY-Q71" userLabel="centerX = Remote View1.trailing"/>
                             <constraint firstItem="dqn-Tz-Jj5" firstAttribute="bottom" secondItem="Zwp-DO-5T7" secondAttribute="bottom" constant="20" id="Fpc-aE-wjW" userLabel="Safe Area.bottom = Local View.bottom"/>
-                            <constraint firstItem="LXN-aK-Wm3" firstAttribute="top" secondItem="qPy-8E-T6N" secondAttribute="top" id="I4Q-cM-hh1"/>
-                            <constraint firstItem="LXN-aK-Wm3" firstAttribute="leading" secondItem="qPy-8E-T6N" secondAttribute="trailing" id="Q0S-IU-LsM"/>
-                            <constraint firstItem="qPy-8E-T6N" firstAttribute="centerX" secondItem="zBK-Om-nWf" secondAttribute="centerX" id="QRh-rT-aK6"/>
-                            <constraint firstItem="zBK-Om-nWf" firstAttribute="leading" secondItem="CM5-Lj-3ty" secondAttribute="leadingMargin" id="S5L-m5-Yrb"/>
-                            <constraint firstAttribute="centerY" secondItem="PKz-rN-me0" secondAttribute="bottom" id="Um9-Ar-5G8"/>
-                            <constraint firstItem="qPy-8E-T6N" firstAttribute="top" secondItem="zBK-Om-nWf" secondAttribute="bottom" id="gap-oY-sdl"/>
-                            <constraint firstItem="zBK-Om-nWf" firstAttribute="trailing" secondItem="qPy-8E-T6N" secondAttribute="trailing" id="jgL-N3-IEF"/>
-                            <constraint firstItem="PKz-rN-me0" firstAttribute="leading" secondItem="zBK-Om-nWf" secondAttribute="trailing" constant="11.5" id="kqQ-65-DXL" userLabel="Remote View1.leading = Remote View0.trailing"/>
-                            <constraint firstItem="dqn-Tz-Jj5" firstAttribute="trailing" secondItem="PKz-rN-me0" secondAttribute="trailing" constant="8" id="m4p-r2-kiA" userLabel="Safe Area.trailing = Remote View2.trailing"/>
-                            <constraint firstItem="qPy-8E-T6N" firstAttribute="bottom" secondItem="Zwp-DO-5T7" secondAttribute="bottom" id="m71-fp-qJf"/>
-                            <constraint firstItem="qPy-8E-T6N" firstAttribute="leading" secondItem="zBK-Om-nWf" secondAttribute="leading" id="mUF-pe-umD"/>
                             <constraint firstItem="dqn-Tz-Jj5" firstAttribute="trailing" secondItem="Zwp-DO-5T7" secondAttribute="trailing" constant="33" id="pND-Zi-qjI" userLabel="Safe Area.trailing = Local View.trailing"/>
-                            <constraint firstItem="LXN-aK-Wm3" firstAttribute="leading" secondItem="qPy-8E-T6N" secondAttribute="trailing" id="wgl-l8-6b7"/>
-                            <constraint firstItem="LXN-aK-Wm3" firstAttribute="bottom" secondItem="Zwp-DO-5T7" secondAttribute="bottom" id="xyb-wW-VhS"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="l7b-W5-MXv"/>
                     <connections>
+                        <outlet property="collectionView" destination="v8Q-eO-C1v" id="tlK-Cg-lCn"/>
                         <outlet property="localView" destination="Zwp-DO-5T7" id="ada-FF-Y7z"/>
-                        <outlet property="remoteView0" destination="zBK-Om-nWf" id="pbU-sW-7CT"/>
-                        <outlet property="remoteView1" destination="PKz-rN-me0" id="Uz2-bp-z9s"/>
-                        <outlet property="remoteView2" destination="qPy-8E-T6N" id="fzb-yG-Td5"/>
-                        <outlet property="remoteView3" destination="LXN-aK-Wm3" id="v8t-Qa-1hx"/>
                     </connections>
                 </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/CellView.swift b/WebRTC-Sample-App/CellView.swift
new file mode 100644
index 0000000..e022baa
--- /dev/null
+++ b/WebRTC-Sample-App/CellView.swift
@@ -0,0 +1,22 @@
+//
+//  CellView.swift
+//  WebRTC-Sample-App
+//
+//  Created by Ahmet Oguz Mermerkaya on 15.07.2024.
+//
+
+import Foundation
+import UIKit
+import WebRTC
+public class CellView: UICollectionViewCell {
+    
+    
+    @IBOutlet weak var playerView: RTCMTLVideoView!
+    
+    var videoTrack:RTCVideoTrack?
+    
+    public override func prepareForReuse() {
+        videoTrack?.remove(playerView)
+    }
+    
+}
diff --git a/WebRTC-Sample-App/ConferenceViewController.swift b/WebRTC-Sample-App/ConferenceViewController.swift
index fbf4bd7..0de2383 100644
--- a/WebRTC-Sample-App/ConferenceViewController.swift
+++ b/WebRTC-Sample-App/ConferenceViewController.swift
@@ -11,7 +11,7 @@ import Foundation
 import WebRTC
 import WebRTCiOSSDK
 
-open class ConferenceViewController: UIViewController , AVCaptureVideoDataOutputSampleBufferDelegate, RTCVideoViewDelegate{
+open class ConferenceViewController: UIViewController ,  AVCaptureVideoDataOutputSampleBufferDelegate, RTCVideoViewDelegate{
     
     /*
      PAY ATTENTION
@@ -22,51 +22,26 @@ open class ConferenceViewController: UIViewController , AVCaptureVideoDataOutput
     var publisherStreamId: String!
     
     @IBOutlet var localView: UIView!
-    @IBOutlet var remoteView0: UIView!
-    @IBOutlet var remoteView1: UIView!
-    @IBOutlet var remoteView2: UIView!
-    @IBOutlet var remoteView3: UIView!
         
-    var remoteViews:[RTCVideoRenderer] = []
+    @IBOutlet weak var collectionView: UICollectionView!
     
     //keeps which remoteView renders which track according to the index
     var remoteViewTrackMap: [RTCVideoTrack?] = [];
         
     var conferenceClient: AntMediaClient?;
-            
+    
     func generateRandomAlphanumericString(length: Int) -> String {
         let characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
         return String((0..<length).map{ _ in characters.randomElement()! })
     }
     
-    func initRenderer(view: UIView)
-    {
-        #if arch(arm64)
-        let localRenderer = RTCMTLVideoView(frame: view.frame)
-        localRenderer.videoContentMode =  .scaleAspectFit
-        #else
-        let localRenderer = RTCEAGLVideoView(frame: view.frame)
-        localRenderer.delegate = self
-        #endif
-        
-        localRenderer.frame = view.bounds
-        
-        localRenderer.isHidden = true;
-        AntMediaClient.embedView(localRenderer, into: view)
-        remoteViews.append(localRenderer)
-        remoteViewTrackMap.append(nil);
-       
-    }
+
     
     open override func viewWillAppear(_ animated: Bool)
     {
         
-        //init renderers because front end manage the viewers
-        initRenderer(view: remoteView0)
-        initRenderer(view: remoteView1)
-        initRenderer(view: remoteView2)
-        initRenderer(view: remoteView3)
-       
+        collectionView.dataSource = self
+        collectionView.delegate = self
         
         AntMediaClient.setDebug(true)
         self.conferenceClient =  AntMediaClient.init();
@@ -95,25 +70,12 @@ open class ConferenceViewController: UIViewController , AVCaptureVideoDataOutput
         
         //stop publishing
         self.conferenceClient?.stop(streamId: self.publisherStreamId);
-
-        
     }
     
     public func removePlayers() {
         Run.onMainThread { [self] in
-            var i = 0;
-            
-            while (i < remoteViewTrackMap.count)
-            {
-                remoteViewTrackMap[i] = nil;
-                if let view = remoteViews[i] as? RTCMTLVideoView {
-                    view.isHidden = true;
-                }
-                else if let view = remoteViews[i] as? RTCEAGLVideoView {
-                    view.isHidden = true;
-                }
-                i += 1
-            }
+            remoteViewTrackMap.removeAll();
+            collectionView.reloadData()
         }
     }
 }
@@ -139,58 +101,14 @@ extension ConferenceViewController: AntMediaClientDelegate
     }
     
     public func trackAdded(track: RTCMediaStreamTrack, stream: [RTCMediaStream]) {
-        
+                
         AntMediaClient.printf("Track is added with id:\(track.trackId)")
-        //tracks are in this format ARDAMSv+ streamId or ARDAMSa + streamId
-        let streamId =  track.trackId.suffix(track.trackId.count - "ARDAMSv".count);
-        
-        if (streamId == self.publisherStreamId) {
-            
-            //TODO: Refactor here to have a better solution. I mean server should not send this track
-            // When we have single object to publish and play the streams. It can be done.
-            
-            DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
-                //It's delay for 3 seconds because in some cases server enables while adding local stream
-                self.conferenceClient?.enableTrack(trackId: String(streamId), enabled: false);
-            }
-            track.isEnabled = false;
-            return;
-            
-        }
-        
-        AntMediaClient.printf("Track is added with id:\(track.trackId) and stream id:\(streamId)")
         if let videoTrack = track as? RTCVideoTrack
         {
-            //find the view to render
-            var i = 0;
-            while (i < remoteViewTrackMap.count) {
-                if (remoteViewTrackMap[i] == nil) {
-                    break
-                }
-                i += 1
+            remoteViewTrackMap.append(videoTrack);
+            Run.onMainThread {
+                self.collectionView.reloadData()
             }
-            
-            if (i < remoteViewTrackMap.count) {
-                //keep the track reference
-                remoteViewTrackMap[i] = videoTrack;
-                videoTrack.add(remoteViews[i]);
-                
-                Run.onMainThread { [self] in
-                    if let view = self.remoteViews[i] as? RTCMTLVideoView {
-                        view.isHidden = false;
-                    }
-                    else if let view = remoteViews[i] as? RTCEAGLVideoView {
-                        view.isHidden = false;
-                    }
-                }
-            }
-            else {
-                AntMediaClient.printf("No space to render new video track")
-            }
-                
-        }
-        else {
-            AntMediaClient.printf("New track is not video track")
         }
     }
     
@@ -203,14 +121,8 @@ extension ConferenceViewController: AntMediaClientDelegate
             {
                 if (remoteViewTrackMap[i]?.trackId == track.trackId)
                 {
-                    remoteViewTrackMap[i] = nil;
-                    
-                    if let view = remoteViews[i] as? RTCMTLVideoView {
-                        view.isHidden = true;
-                    }
-                    else if let view = remoteViews[i] as? RTCEAGLVideoView {
-                        view.isHidden = true;
-                    }
+                    remoteViewTrackMap.remove(at: i)
+                    collectionView.reloadData();
                     break;
                 }
                 i += 1
@@ -280,3 +192,33 @@ extension ConferenceViewController: AntMediaClientDelegate
     }
 }
 
+extension ConferenceViewController: UICollectionViewDataSource {
+    public func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return remoteViewTrackMap.count
+    }
+
+    public func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "playerCell", for: indexPath) as! CellView;
+        cell.videoTrack = remoteViewTrackMap[indexPath.item];
+        cell.playerView.videoContentMode = .scaleAspectFit
+        remoteViewTrackMap[indexPath.item]?.add(cell.playerView)
+        
+        return cell
+    }
+    
+}
+
+extension ConferenceViewController: UICollectionViewDelegateFlowLayout {
+    public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+       let columns: CGFloat = 2
+       let collectionViewWidth = collectionView.bounds.width
+       let flowLayout = collectionViewLayout as! UICollectionViewFlowLayout
+       let spaceBetweenCells = flowLayout.minimumInteritemSpacing * (columns - 1)
+       let adjustedWidth = collectionViewWidth - spaceBetweenCells
+       let width: CGFloat = adjustedWidth / columns
+       let height: CGFloat = 200
+       return CGSize(width: width, height: height)
+        
+    }
+}
+
diff --git a/WebRTC-Sample-App/Util/Helper/SwiftyUserDefaults.swift b/WebRTC-Sample-App/Util/Helper/SwiftyUserDefaults.swift
index b7ba00a..d5df76b 100644
--- a/WebRTC-Sample-App/Util/Helper/SwiftyUserDefaults.swift
+++ b/WebRTC-Sample-App/Util/Helper/SwiftyUserDefaults.swift
@@ -124,7 +124,7 @@ public extension UserDefaults {
     
     /// Sets value for `key`
     
-    public subscript(key: String) -> Any? {
+    subscript(key: String) -> Any? {
         get {
             // return untyped Proxy
             // (make sure we don't fall into infinite loop)
@@ -152,13 +152,13 @@ public extension UserDefaults {
     
     /// Returns `true` if `key` exists
     
-    public func hasKey(_ key: String) -> Bool {
+    func hasKey(_ key: String) -> Bool {
         return object(forKey: key) != nil
     }
     
     /// Removes value for `key`
     
-    public func remove(_ key: String) {
+    func remove(_ key: String) {
         removeObject(forKey: key)
     }
     
@@ -167,7 +167,7 @@ public extension UserDefaults {
     /// - Note: This method only removes keys on the receiver `UserDefaults` object.
     ///         System-defined keys will still be present afterwards.
     
-    public func removeAll() {
+    func removeAll() {
         for (key, _) in dictionaryRepresentation() {
             removeObject(forKey: key)
         }
diff --git a/WebRTCiOSSDK.xcodeproj/project.pbxproj b/WebRTCiOSSDK.xcodeproj/project.pbxproj
index 26dcd4e..66fe6f5 100644
--- a/WebRTCiOSSDK.xcodeproj/project.pbxproj
+++ b/WebRTCiOSSDK.xcodeproj/project.pbxproj
@@ -14,6 +14,7 @@
 		A8B966052A069A2800D67CA1 /* WebRTCiOSSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A8DABFCA2A0639D80007CDE7 /* WebRTCiOSSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		A8B966092A069A2C00D67CA1 /* WebRTC.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A8DABFFD2A063A500007CDE7 /* WebRTC.xcframework */; };
 		A8B9660A2A069A2C00D67CA1 /* WebRTC.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A8DABFFD2A063A500007CDE7 /* WebRTC.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		A8C0684E2C45036F00BAD624 /* CellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8C0684D2C45036F00BAD624 /* CellView.swift */; };
 		A8CAF2BF2C0B1DFC00520691 /* ClientStatistics.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8CAF2BD2C0B1DFC00520691 /* ClientStatistics.swift */; };
 		A8CAF2C02C0B90DD00520691 /* WebRTC.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A8DABFFD2A063A500007CDE7 /* WebRTC.xcframework */; };
 		A8CAF2C12C0B90DD00520691 /* WebRTC.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A8DABFFD2A063A500007CDE7 /* WebRTC.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -157,6 +158,7 @@
 		A8B965FA2A06969900D67CA1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A8B966022A0698EC00D67CA1 /* WebRTC-Sample-App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "WebRTC-Sample-App.entitlements"; sourceTree = "<group>"; };
 		A8B966032A06991200D67CA1 /* ScreenShare.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ScreenShare.entitlements; sourceTree = "<group>"; };
+		A8C0684D2C45036F00BAD624 /* CellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CellView.swift; sourceTree = "<group>"; };
 		A8CAF2BD2C0B1DFC00520691 /* ClientStatistics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ClientStatistics.swift; sourceTree = "<group>"; };
 		A8DABFCA2A0639D80007CDE7 /* WebRTCiOSSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebRTCiOSSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		A8DABFCD2A0639D80007CDE7 /* WebRTCiOSSDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebRTCiOSSDK.h; sourceTree = "<group>"; };
@@ -357,6 +359,7 @@
 				A8DAC0112A063AB50007CDE7 /* Assets.xcassets */,
 				A8DAC0162A063AB50007CDE7 /* Info.plist */,
 				A8DAC00E2A063AB30007CDE7 /* WebRTC_Sample_App.xcdatamodeld */,
+				A8C0684D2C45036F00BAD624 /* CellView.swift */,
 			);
 			path = "WebRTC-Sample-App";
 			sourceTree = "<group>";
@@ -552,7 +555,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1420;
-				LastUpgradeCheck = 1420;
+				LastUpgradeCheck = 1540;
 				TargetAttributes = {
 					A8B965F32A06969900D67CA1 = {
 						CreatedOnToolsVersion = 14.2;
@@ -697,6 +700,7 @@
 				A8DAC0442A063BC00007CDE7 /* AlertHelper.swift in Sources */,
 				A8DAC0422A063BC00007CDE7 /* WelcomeViewController.swift in Sources */,
 				A8DAC0482A063BC00007CDE7 /* ConferenceViewController.swift in Sources */,
+				A8C0684E2C45036F00BAD624 /* CellView.swift in Sources */,
 				A8DAC0412A063BC00007CDE7 /* VideoViewController.swift in Sources */,
 				A8DAC0472A063BC00007CDE7 /* Run.swift in Sources */,
 				A8DAC0082A063AB30007CDE7 /* SceneDelegate.swift in Sources */,
@@ -866,6 +870,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -929,6 +934,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -952,6 +958,7 @@
 		A8DABFDD2A0639D80007CDE7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -959,6 +966,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -969,6 +977,7 @@
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20";
 				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.WebRTCiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -984,6 +993,7 @@
 		A8DABFDE2A0639D80007CDE7 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -991,6 +1001,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1001,6 +1012,7 @@
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20";
 				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.WebRTCiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
diff --git a/WebRTCiOSSDK.xcodeproj/xcshareddata/xcschemes/ScreenShare.xcscheme b/WebRTCiOSSDK.xcodeproj/xcshareddata/xcschemes/ScreenShare.xcscheme
index 1e01609..2f8c2a7 100644
--- a/WebRTCiOSSDK.xcodeproj/xcshareddata/xcschemes/ScreenShare.xcscheme
+++ b/WebRTCiOSSDK.xcodeproj/xcshareddata/xcschemes/ScreenShare.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
+   LastUpgradeVersion = "1540"
    wasCreatedForAppExtension = "YES"
    version = "1.3">
    <BuildAction
@@ -72,6 +72,7 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
       launchAutomaticallySubstyle = "2">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/WebRTCiOSSDK.xcodeproj/xcshareddata/xcschemes/WebRTC-Sample-App.xcscheme b/WebRTCiOSSDK.xcodeproj/xcshareddata/xcschemes/WebRTC-Sample-App.xcscheme
index 9c69c5a..918f146 100644
--- a/WebRTCiOSSDK.xcodeproj/xcshareddata/xcschemes/WebRTC-Sample-App.xcscheme
+++ b/WebRTCiOSSDK.xcodeproj/xcshareddata/xcschemes/WebRTC-Sample-App.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1540"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/WebRTCiOSSDK/api/AntMediaClient.swift b/WebRTCiOSSDK/api/AntMediaClient.swift
index 77e606a..95ae1fa 100644
--- a/WebRTCiOSSDK/api/AntMediaClient.swift
+++ b/WebRTCiOSSDK/api/AntMediaClient.swift
@@ -1021,8 +1021,13 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
                        message: broadcastObject ?? [:]
                    )
                }
+                else if definition == RESOLUTION_CHANGE_INFO_COMMAND {
+                    let streamId = message[STREAM_ID] as? String ?? "";
+                    self.delegate?.eventHappened(streamId: streamId, eventType: definition, payload: message)
+                }
             
                 break;
+           
             case ROOM_INFORMATION_COMMAND:
                 if let updatedStreamsInTheRoom = message[STREAMS] as? [String] {
                    //check that there is a new stream exists
@@ -1054,6 +1059,9 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
                             
                 }
                 
+                break;
+            case "pong":
+                //dont do anything
                 break;
             case "error":
                 guard let definition = message["definition"] as? String else {
@@ -1110,6 +1118,16 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
         }
     }
     
+    public func forceStreamQuality(resolutionHeight:Int, streamId:String) {
+        if (self.isWebSocketConnected)
+        {
+            self.webSocket?.write(string: [COMMAND: FORCE_STREAM_QUALITY_INFO, STREAM_ID: (self.playerStreamId!), TRACK_ID:streamId, STREAM_HEIGHT_FIELD: resolutionHeight].json)
+        }
+        else {
+            AntMediaClient.printf("Websocket is not connected")
+        }
+    }
+    
     public func registerStatsListener(for streamId:String, timeInterval:Double = 5) {
         self.rtcStatsTimer?.invalidate();
         
diff --git a/WebRTCiOSSDK/api/AntMediaClientProtocol.swift b/WebRTCiOSSDK/api/AntMediaClientProtocol.swift
index 285d96a..3b3b6cc 100644
--- a/WebRTCiOSSDK/api/AntMediaClientProtocol.swift
+++ b/WebRTCiOSSDK/api/AntMediaClientProtocol.swift
@@ -36,6 +36,7 @@ let EVENT_TYPE_CAM_TURNED_OFF = "CAM_TURNED_OFF";
 let EVENT_TYPE_CAM_TURNED_ON = "CAM_TURNED_ON";
 let GET_BROADCAST_OBJECT_COMMAND = "getBroadcastObject"
 let BROADCAST_OBJECT_NOTIFICATION = "broadcastObject"
+public let RESOLUTION_CHANGE_INFO_COMMAND = "resolutionChangeInfo"
 public let EVENT_TYPE_TRACK_LIST_UPDATED = "TRACK_LIST_UPDATED"
 public let EVENT_TYPE_VIDEO_TRACK_ASSIGNMENT_LIST = "VIDEO_TRACK_ASSIGNMENT_LIST";
 
@@ -260,6 +261,12 @@ public protocol AntMediaClientProtocol {
       If the resolution is set to 0, then automatic stream quality will be used according to the measured network speed.
      */
     func forStreamQuality(resolutionHeight:Int);
+    
+    /**
+     - resolutionHeight: The height to be forced. If you set the height to zero, it will become auto
+     - streamId: The streamId or subtrack Id to change the resolution
+     */
+    func forceStreamQuality(resolutionHeight:Int, streamId:String)
     /**
      It get webrtc statistis and calls completionHandler.  There is a sample code for below to get the audio level
      in the application latyer