Proper conditional tracking