changed feature to support android