changes

Should work with android now