Changes to AppDelegate