udpated with iOS 8