changes to support android