Improved iOS 5 fallback support