Update to work with iOS 8