Android update to pass extras around, still something misisng to do this easier