Android Solution Updated