Solution changes for iOS