AndroidTracker updated (in progress)