Switched to iOS 8 method