merged with latest update code with anroid