Updated for new iOS 7 features