Started working on android version