Updated for remote tracking