- little changes to work on android