Adding changes from professor meeting and United Flight 5609