added changes to suit android