                         else
                         {
                             DispatchQueue.main.async {
-                                TSMessage.showNotification(withTitle: "Success", subtitle: "You successfully added a new device to your account. Device has been named \(deviceName).", type: .success)
-                                self.photonSelectionTableView.reloadData()
+                                self.showSetupSuccessMessageAndReload()
                             }
                         }
                     })

                }
                else
                {
                    TSMessage.showNotification(withTitle: "Success", subtitle: "You successfully added a new device to your account. Device is named \(deviceAdded.name!).", type: .success)
                    self.photonSelectionTableView.reloadData()
                    
                }
            }
            else // Device is nil so we treat it as not claimed

    }
    
    
    func showSetupSuccessMessageAndReload() {
        if (self.deviceListEmpty) {
            TSMessage.showNotification(withTitle: "Success", subtitle: "Nice, you've successfully set up your first Particle! You'll be receiving a welcome email with helpful tips and links to resources. Start developing by going to https://build.particle.io/ on your computer, or stay here and enjoy the magic of Tinker.", type: .success)
        } else {
            TSMessage.showNotification(withTitle: "Success", subtitle: "You successfully added a new device to your account.", type: .success)
        }
        self.photonSelectionTableView.reloadData()

    }
    
    func sparkSetupViewController(_ controller: SparkSetupMainController!, didFinishWith result: SparkSetupMainControllerResult, device: SparkDevice!) {
        if result == .success
        {
