diff --git a/Examples/ObjectiveCExample/OneSignalDemo/Base.lproj/Main.storyboard b/Examples/ObjectiveCExample/OneSignalDemo/Base.lproj/Main.storyboard
index 28169778a..65b3a4789 100644
--- a/Examples/ObjectiveCExample/OneSignalDemo/Base.lproj/Main.storyboard
+++ b/Examples/ObjectiveCExample/OneSignalDemo/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="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="AXT-p6-7qm">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="AXT-p6-7qm">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17124"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -19,7 +19,7 @@
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="1Vl-Nl-rQD">
                                 <rect key="frame" x="20" y="44" width="374" height="430"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iPu-pV-22h">
+                                    <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iPu-pV-22h">
                                         <rect key="frame" x="0.0" y="0.0" width="374" height="70"/>
                                         <color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
                                         <state key="normal" title="Send Tags"/>
@@ -27,7 +27,7 @@
                                             <action selector="sendTagsButtonPressed:" destination="AXT-p6-7qm" eventType="touchUpInside" id="7b9-Hl-ZXZ"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="41b-cG-e7b">
+                                    <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="41b-cG-e7b">
                                         <rect key="frame" x="0.0" y="80" width="374" height="30"/>
                                         <color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
                                         <state key="normal" title="Get Tags"/>
@@ -35,7 +35,7 @@
                                             <action selector="getTagsButtonPressed:" destination="AXT-p6-7qm" eventType="touchUpInside" id="jv3-tK-aeO"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SdD-3O-u6w">
+                                    <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SdD-3O-u6w">
                                         <rect key="frame" x="0.0" y="120" width="374" height="30"/>
                                         <color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
                                         <state key="normal" title="Delete or Update Tags"/>
@@ -43,7 +43,7 @@
                                             <action selector="updateTagsButtonPressed:" destination="AXT-p6-7qm" eventType="touchUpInside" id="0G3-mC-lLk"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wMv-T5-C8b">
+                                    <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wMv-T5-C8b">
                                         <rect key="frame" x="0.0" y="160" width="374" height="30"/>
                                         <color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
                                         <state key="normal" title="Get Subscription State"/>
@@ -51,7 +51,7 @@
                                             <action selector="getSubscriptionState:" destination="AXT-p6-7qm" eventType="touchUpInside" id="IeM-Sj-DyC"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zlI-PX-qzk">
+                                    <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zlI-PX-qzk">
                                         <rect key="frame" x="0.0" y="200" width="374" height="30"/>
                                         <color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
                                         <state key="normal" title="Prompt Location"/>
@@ -59,7 +59,7 @@
                                             <action selector="promptLocationButtonPressed:" destination="AXT-p6-7qm" eventType="touchUpInside" id="n1U-pm-4mA"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="E45-qs-O0P">
+                                    <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="E45-qs-O0P">
                                         <rect key="frame" x="0.0" y="240" width="374" height="30"/>
                                         <color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
                                         <state key="normal" title="Send Notification 1"/>
@@ -67,7 +67,7 @@
                                             <action selector="sendFirstExampleNotificationButtonPressed:" destination="AXT-p6-7qm" eventType="touchUpInside" id="DfP-Em-ks7"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="trP-IY-HpK">
+                                    <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="trP-IY-HpK">
                                         <rect key="frame" x="0.0" y="280" width="374" height="30"/>
                                         <color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
                                         <state key="normal" title="Send Notification 2"/>
@@ -75,7 +75,7 @@
                                             <action selector="sendSecondExampleNotificationButtonPressed:" destination="AXT-p6-7qm" eventType="touchUpInside" id="ENC-eV-MaT"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kmQ-Zn-EUg">
+                                    <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kmQ-Zn-EUg">
                                         <rect key="frame" x="0.0" y="320" width="374" height="30"/>
                                         <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                         <state key="normal" title="Register For Push Notifications">
@@ -96,7 +96,7 @@
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits" keyboardType="emailAddress" keyboardAppearance="alert" returnKeyType="go"/>
                                             </textField>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yhV-BM-esi">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yhV-BM-esi">
                                                 <rect key="frame" x="255" y="0.0" width="111" height="30"/>
                                                 <color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
                                                 <constraints>
@@ -138,7 +138,7 @@
                                                     <constraint firstAttribute="width" constant="20" id="Kqs-jR-90e"/>
                                                 </constraints>
                                             </activityIndicatorView>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9TA-R7-iEH">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9TA-R7-iEH">
                                                 <rect key="frame" x="0.0" y="0.0" width="374" height="30"/>
                                                 <color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
                                                 <state key="normal" title="Logout Email"/>
@@ -164,7 +164,7 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="fsm-CS-h1i">
-                                <rect key="frame" x="40" y="484" width="204" height="31"/>
+                                <rect key="frame" x="40" y="484" width="260" height="31"/>
                                 <subviews>
                                     <switch opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="NBb-Ft-ae3">
                                         <rect key="frame" x="0.0" y="0.0" width="51" height="31"/>
@@ -172,8 +172,8 @@
                                             <action selector="subscriptionSwitchValueChanged:" destination="AXT-p6-7qm" eventType="valueChanged" id="tzO-h5-RPO"/>
                                         </connections>
                                     </switch>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Set Subscription?" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4rT-9H-8AV">
-                                        <rect key="frame" x="69" y="0.0" width="135" height="31"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="OneSignal Push Disabled" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4rT-9H-8AV">
+                                        <rect key="frame" x="69" y="0.0" width="191" height="31"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -188,6 +188,7 @@
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="pj7-6w-ROv"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="trailingMargin" secondItem="1Vl-Nl-rQD" secondAttribute="trailing" id="1cN-21-VcK"/>
@@ -200,7 +201,6 @@
                             <constraint firstItem="fsm-CS-h1i" firstAttribute="top" secondItem="1Vl-Nl-rQD" secondAttribute="bottom" constant="10" id="cnl-mw-yfH"/>
                             <constraint firstItem="LWb-e4-NEk" firstAttribute="leading" secondItem="P0Q-pH-d4b" secondAttribute="leadingMargin" id="fJ1-YR-iGf"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="pj7-6w-ROv"/>
                     </view>
                     <connections>
                         <outlet property="emailTextField" destination="W7f-9H-DoQ" id="gvg-OS-8h5"/>
@@ -234,7 +234,7 @@
                                 <rect key="frame" x="20" y="149" width="374" height="693"/>
                                 <color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </webView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="InB-FR-yQq">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="InB-FR-yQq">
                                 <rect key="frame" x="20" y="44" width="100" height="60"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
@@ -247,6 +247,7 @@
                                 </connections>
                             </button>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="bpR-8Y-SWA"/>
                         <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstItem="bSh-Qe-R5f" firstAttribute="leading" secondItem="cyf-zr-4te" secondAttribute="leadingMargin" id="22h-VS-C2E"/>
@@ -256,7 +257,6 @@
                             <constraint firstItem="InB-FR-yQq" firstAttribute="leading" secondItem="cyf-zr-4te" secondAttribute="leadingMargin" id="ehE-3g-tVO"/>
                             <constraint firstItem="bSh-Qe-R5f" firstAttribute="trailing" secondItem="cyf-zr-4te" secondAttribute="trailingMargin" id="lWi-Gr-QiR"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="bpR-8Y-SWA"/>
                     </view>
                     <connections>
                         <outlet property="webView" destination="bSh-Qe-R5f" id="Wje-4u-LuU"/>
@@ -278,7 +278,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="X2N-jW-yZG">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="X2N-jW-yZG">
                                 <rect key="frame" x="133" y="300" width="109" height="67"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -288,8 +288,8 @@
                                 </connections>
                             </button>
                         </subviews>
-                        <color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <viewLayoutGuide key="safeArea" id="0nJ-dR-KGS"/>
+                        <color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="rKV-we-pPd" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
diff --git a/Examples/ObjectiveCExample/OneSignalDemo/ViewController.m b/Examples/ObjectiveCExample/OneSignalDemo/ViewController.m
index 4f1e53b87..89e910d60 100644
--- a/Examples/ObjectiveCExample/OneSignalDemo/ViewController.m
+++ b/Examples/ObjectiveCExample/OneSignalDemo/ViewController.m
@@ -51,6 +51,7 @@ -(void)viewDidLoad {
         self.subscriptionStatusSwitch.userInteractionEnabled = true;
         self.registerButton.backgroundColor = [UIColor greenColor];
         self.registerButton.userInteractionEnabled = false;
+        self.subscriptionStatusLabel.text = @"OneSignal Push Enabled";
     }
     
     [OneSignal addPermissionObserver:self];
@@ -237,9 +238,9 @@ - (IBAction)registerButtonPressed:(UIButton *)sender {
 
 - (IBAction)subscriptionSwitchValueChanged:(UISwitch *)sender {
     if (sender.isOn) {
-        [OneSignal setSubscription:true];
+        [OneSignal disablePush:false];
     } else {
-        [OneSignal setSubscription:false];
+        [OneSignal disablePush:true];
     }
 }
 
@@ -300,11 +301,11 @@ -(void)onOSPermissionChanged:(OSPermissionStateChanges *)stateChanges {
 -(void)onOSSubscriptionChanged:(OSSubscriptionStateChanges *)stateChanges {
     if (stateChanges.from.subscribed &&  !stateChanges.to.subscribed) {
         self.subscriptionStatusSwitch.on = false;
-        self.subscriptionStatusLabel.text = @"Set Subscription OFF";
+        self.subscriptionStatusLabel.text = @"OneSignal Push Disabled";
         self.registerButton.backgroundColor = [UIColor redColor];
     } else if (!stateChanges.from.subscribed && stateChanges.to.subscribed) {
         self.subscriptionStatusSwitch.on = true;
-        self.subscriptionStatusLabel.text = @"Set Subscription ON";
+        self.subscriptionStatusLabel.text = @"OneSignal Push Enabled";
         self.registerButton.backgroundColor = [UIColor greenColor];
     }
 }
diff --git a/Examples/SwiftExample/OneSignalDemo/Base.lproj/Main.storyboard b/Examples/SwiftExample/OneSignalDemo/Base.lproj/Main.storyboard
index 95d3f2435..bcbceef07 100644
--- a/Examples/SwiftExample/OneSignalDemo/Base.lproj/Main.storyboard
+++ b/Examples/SwiftExample/OneSignalDemo/Base.lproj/Main.storyboard
@@ -168,7 +168,7 @@
                                             <action selector="onAllowNotificationsSwitch:" destination="BYZ-38-t0r" eventType="valueChanged" id="9gF-vS-Dpc"/>
                                         </connections>
                                     </switch>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Set Subscription?" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ljh-6a-4qh">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="OneSignal Push Disabled" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ljh-6a-4qh">
                                         <rect key="frame" x="69" y="0.0" width="234" height="31"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <nil key="textColor"/>
diff --git a/Examples/SwiftExample/OneSignalDemo/ViewController.swift b/Examples/SwiftExample/OneSignalDemo/ViewController.swift
index 64d1118b1..83991db3b 100644
--- a/Examples/SwiftExample/OneSignalDemo/ViewController.swift
+++ b/Examples/SwiftExample/OneSignalDemo/ViewController.swift
@@ -54,6 +54,7 @@ class ViewController: UIViewController, OSPermissionObserver, OSSubscriptionObse
             allowNotificationsSwitch.isUserInteractionEnabled = true
             registerForPushNotificationsButton.backgroundColor = UIColor.green
             registerForPushNotificationsButton.isUserInteractionEnabled = false
+            setSubscriptionLabel.text = "OneSignal Push Enabled"
         }
         OneSignal.add(self as OSPermissionObserver)
         OneSignal.add(self as OSSubscriptionObserver)
@@ -118,12 +119,12 @@ class ViewController: UIViewController, OSPermissionObserver, OSSubscriptionObse
     func onOSSubscriptionChanged(_ stateChanges: OSSubscriptionStateChanges) {
         if stateChanges.from.subscribed && !stateChanges.to.subscribed { // NOT SUBSCRIBED != DENIED
             allowNotificationsSwitch.isOn = false
-            setSubscriptionLabel.text = "Set Subscription OFF"
+            setSubscriptionLabel.text = "OneSignal Push Disabled"
             registerForPushNotificationsButton.backgroundColor = UIColor.red
         } else if !stateChanges.from.subscribed && stateChanges.to.subscribed {
             allowNotificationsSwitch.isOn = true
             allowNotificationsSwitch.isUserInteractionEnabled = true
-            setSubscriptionLabel.text = "Set Subscription ON"
+            setSubscriptionLabel.text = "OneSignal Push Enabled"
             registerForPushNotificationsButton.backgroundColor = UIColor.green
             registerForPushNotificationsButton.isUserInteractionEnabled = false
         }
@@ -290,9 +291,9 @@ class ViewController: UIViewController, OSPermissionObserver, OSSubscriptionObse
         // turn off notifications
         // IMPORTANT: user must have already accepted notifications for this to be called
         if !allowNotificationsSwitch.isOn {
-            OneSignal.setSubscription(false)
+            OneSignal.disablePush(true)
         } else {
-            OneSignal.setSubscription(true)
+            OneSignal.disablePush(false)
         }
     }