update for Android and other platforms