Some changes to the android version