changes for iOS and android