More work on android version