porting to android changes