Commit by Jordi: Changes in the App Delegate