Making it work on android