modifications to the android version. but it's still not working :(