3 Commits (feature/markerMode)