Added android mode