Updated with additional changes for iOS 8