Some new changes
Android improvements