added some if android statements