Updated for iOS 8.0