Updates to account for iOS strategy change