diff --git a/config/project-scratch-def.json b/config/project-scratch-def.json
index 76764a4..6065823 100644
--- a/config/project-scratch-def.json
+++ b/config/project-scratch-def.json
@@ -1,7 +1,9 @@
 {
     "orgName": "Company",
     "edition": "Developer",
-    "orgPreferences" : {
-        "enabled": ["S1DesktopEnabled"]
+    "settings": {
+        "orgPreferenceSettings": {
+            "s1DesktopEnabled": true
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/DemoController.cls b/force-app/main/default/classes/DemoController.cls
index b90a42f..55591bf 100644
--- a/force-app/main/default/classes/DemoController.cls
+++ b/force-app/main/default/classes/DemoController.cls
@@ -1,4 +1,7 @@
 public with sharing class DemoController {
+
+    private String appVersion = '1.0.0';
+
     /**
      * An empty constructor for the testing
      */
@@ -8,6 +11,6 @@ public with sharing class DemoController {
      * Get the version of the SFDX demo app
      */
     public String getAppVersion() {
-        return '1.0.0';
+        return appVersion;
     }
-}
+}
\ No newline at end of file
diff --git a/setup.sh b/setup.sh
index a59a25a..0f50d5d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -13,13 +13,14 @@
 HEROKU_TEAM_NAME=""
 
 # Descriptive name for the Heroku app
-HEROKU_APP_NAME="YOUR_APP_NAME"
+HEROKU_APP_NAME="sfdc2019jef"
 
 # Name of the Heroku apps you'll use
 HEROKU_DEV_APP_NAME="$HEROKU_APP_NAME-dev"
 HEROKU_STAGING_APP_NAME="$HEROKU_APP_NAME-staging"
 HEROKU_PROD_APP_NAME="$HEROKU_APP_NAME-prod"
 
+
 # Pipeline
 HEROKU_PIPELINE_NAME="$HEROKU_APP_NAME-pipeline"
 
@@ -30,7 +31,7 @@ STAGING_USERNAME="TestOrg"
 PROD_USERNAME="ProdOrg"
 
 # Your package name from force:package:list
-PACKAGE_NAME="YOUR_PACKAGE_NAME"
+PACKAGE_NAME="SamplePkg1"
 
 # Repository with your code (username/repo)
 # Only specify a value if you have already connected your GitHub account with Heroku,
@@ -103,7 +104,7 @@ fi
 
 # Setup sfdxUrl for Dev Org auth
 devSfdxAuthUrl=$(sfdx force:org:display --verbose -u $DEV_USERNAME | grep "Sfdx Auth Url" | awk '{ print $4 }')
-if [[ "$devSfdxAuthUrl" =~ ^force://.*\.salesforce\.com$ ]]; then
+if [[ "$devSfdxAuthUrl" =~ ^force://.*\.salesforce\.com/$ ]]; then
   heroku config:set SFDX_AUTH_URL=$devSfdxAuthUrl -a $HEROKU_DEV_APP_NAME
 else
   echo ""
@@ -114,7 +115,7 @@ fi
 
 # Setup sfdxUrl for Staging Org auth
 stagingSfdxAuthUrl=$(sfdx force:org:display --verbose -u $STAGING_USERNAME | grep "Sfdx Auth Url" | awk '{ print $4 }')
-if [[ "$stagingSfdxAuthUrl" =~ ^force://.*\.salesforce\.com$ ]]; then
+if [[ "$stagingSfdxAuthUrl" =~ ^force://.*\.salesforce\.com/$ ]]; then
   heroku config:set SFDX_AUTH_URL=$stagingSfdxAuthUrl -a $HEROKU_STAGING_APP_NAME
 else
   echo ""
@@ -125,7 +126,7 @@ fi
 
 # Setup sfdxUrl for Prod Org auth
 prodSfdxAuthUrl=$(sfdx force:org:display --verbose -u $PROD_USERNAME | grep "Sfdx Auth Url" | awk '{ print $4 }')
-if [[ "$prodSfdxAuthUrl" =~ ^force://.*\.salesforce\.com$ ]]; then
+if [[ "$prodSfdxAuthUrl" =~ ^force://.*\.salesforce\.com/$ ]]; then
   heroku config:set SFDX_AUTH_URL=$prodSfdxAuthUrl -a $HEROKU_PROD_APP_NAME
 else
   echo ""
diff --git a/sfdx-project.json b/sfdx-project.json
index 02a98b9..025d42a 100644
--- a/sfdx-project.json
+++ b/sfdx-project.json
@@ -2,10 +2,24 @@
     "packageDirectories": [
         {
             "path": "force-app",
-            "default": true
+            "default": true,
+            "package": "SamplePkg",
+            "versionName": "ver 0.1",
+            "versionNumber": "0.1.0.NEXT"
+        },
+        {
+            "path": "force-app",
+            "package": "SamplePkg1",
+            "versionName": "ver 0.1",
+            "versionNumber": "0.1.0.NEXT",
+            "default": false
         }
     ],
     "namespace": "",
     "sfdcLoginUrl": "https://login.salesforce.com",
-    "sourceApiVersion": "43.0"
+    "sourceApiVersion": "43.0",
+    "packageAliases": {
+        "SamplePkg": "0Ho4P000000XZCXSA4",
+        "SamplePkg1": "0Ho4P000000XZCcSAO"
+    }
 }
\ No newline at end of file