started making changes for Android support