More changes in AppDelegate