Changes for iOS