updates to work in iOS 8.*