diff --git a/_pages/plugins/trackmate/detectors/trackmate-yolo.md b/_pages/plugins/trackmate/detectors/trackmate-yolo.md
new file mode 100644
index 000000000..b869f3628
--- /dev/null
+++ b/_pages/plugins/trackmate/detectors/trackmate-yolo.md
@@ -0,0 +1,54 @@
+---
+title: TrackMate-YOLO
+categories: [Detection,icTracking,Deep Learning]
+icon: /media/icons/YOLO-logo.png
+description: Cellpose-SAM integration in TrackMate.
+categories: [Segmentation,Tracking,Machine Learning]
+artifact: sc.fiji:TrackMate-YOLO
+---
+
+{% include img src="/media/plugins/trackmate/detectors/YOLO/trackmate-yolo-detector-03.png" width='400'  %}{% include img src="/media/plugins/trackmate/detectors/YOLO/trackmate-yolo-detector-02.png" width='300'  %}
+
+{% include img src="/media/plugins/trackmate/detectors/YOLO/trackmate-yolo-detector-01.gif" width='600'  align='center' %}
+
+This page describes a detector module for [TrackMate](/plugins/trackmate/index) that relies on [YOLO](https://github.com/ultralytics/ultralytics), an AI-based detection algorithm, popular for natural images. 
+It is not included in the core of TrackMate and must be installed via its own [update site](/update-sites/following). 
+It also requires YOLO to be installed on your system and working independently. 
+
+If you use this detector for your research, please cite the YOLO webiste
+
+_Jocher, G., Qiu, J., & Chaurasia, A. (2023). Ultralytics YOLO (Version 8.0.0) [Computer software]. https://github.com/ultralytics/ultralytics_
+
+
+## Installation
+
+We need to subscribe to an extra update site in Fiji, and have a working installation of cellpose on your system.
+
+### TrackMate-YOLO update site
+
+In Fiji, go to {% include bc path='Help|Update...' %}. Update and restart Fiji until it is up-to-date. Then go to the update menu once more, and click on the `Manage update sites` button, at the bottom-left of the updater window. A new window containing all the known update sites will appear. Click on the  **TrackMate-YOLO** check box and restart Fiji one more time. 
+
+
+### YOLO
+
+This step requires you to have a working conda installation, like for any of the Python tools integrated in TrackMate. 
+We recommend [miniforge](https://github.com/conda-forge/miniforge).
+
+For YOLO specifically, we copy below the installation instruction from the [YOLO GitHub repo](https://github.com/ultralytics/ultralytics#-documentation)
+
+```zsh
+conda create --name yolo python=3.10
+conda activate yolo
+pip install ultralytics
+```
+
+Once this is done, still in the same terminal, test that YOLO was properly installed with e.g.:
+
+```zsh
+❯ yolo version
+8.3.168
+```
+
+### TrackMate conda configuration
+
+If you have not done it yet, you need to [configure the TrackMate conda path in Fiji](/plugins/trackmate/trackmate-conda-path). 
diff --git a/_pages/plugins/trackmate/index.md b/_pages/plugins/trackmate/index.md
index 79de8a704..e546a6aa7 100644
--- a/_pages/plugins/trackmate/index.md
+++ b/_pages/plugins/trackmate/index.md
@@ -140,6 +140,10 @@ TrackMate has a modular design and ships several algorithms of several types: de
 Many of these extra modules connect with an external tool, typically in Python, that needs to be installed via Conda or Mamba. 
 TrackMate needs to know where your conda environments are installed, and this is explained here: [trackmate-conda-path](trackmate-conda-path)
 
+Since v8, TrackMate ships better track and segmentation editing. 
+Track editing (correcting missing or spurious links over time) is mainly done in the main view and [TrackScheme](views/trackscheme).
+The shape of objects can be edited in the new [segmentation editor](tutorials/trackmate-segmentation-editor).
+
 
 ### Downloadable documents and tutorials
 
diff --git a/media/icons/YOLO-logo.png b/media/icons/YOLO-logo.png
new file mode 100644
index 000000000..388c93066
Binary files /dev/null and b/media/icons/YOLO-logo.png differ
diff --git a/media/plugins/trackmate/detectors/YOLO/SHicham_Video1_crop.gif b/media/plugins/trackmate/detectors/YOLO/SHicham_Video1_crop.gif
new file mode 100644
index 000000000..c9230ca82
Binary files /dev/null and b/media/plugins/trackmate/detectors/YOLO/SHicham_Video1_crop.gif differ
diff --git a/media/plugins/trackmate/detectors/YOLO/trackmate-yolo-detector-01.gif b/media/plugins/trackmate/detectors/YOLO/trackmate-yolo-detector-01.gif
new file mode 100644
index 000000000..851aa595d
Binary files /dev/null and b/media/plugins/trackmate/detectors/YOLO/trackmate-yolo-detector-01.gif differ
diff --git a/media/plugins/trackmate/detectors/YOLO/trackmate-yolo-detector-02.png b/media/plugins/trackmate/detectors/YOLO/trackmate-yolo-detector-02.png
new file mode 100644
index 000000000..b21309b33
Binary files /dev/null and b/media/plugins/trackmate/detectors/YOLO/trackmate-yolo-detector-02.png differ
diff --git a/media/plugins/trackmate/detectors/YOLO/trackmate-yolo-detector-03.png b/media/plugins/trackmate/detectors/YOLO/trackmate-yolo-detector-03.png
new file mode 100644
index 000000000..436f17803
Binary files /dev/null and b/media/plugins/trackmate/detectors/YOLO/trackmate-yolo-detector-03.png differ