Some android code added