diff --git a/src/Toplo-Demo/ToploDemoPresenter.class.st b/src/Toplo-Demo/ToploDemoPresenter.class.st
index 08597ab6..d28fb7db 100644
--- a/src/Toplo-Demo/ToploDemoPresenter.class.st
+++ b/src/Toplo-Demo/ToploDemoPresenter.class.st
@@ -43,7 +43,7 @@ ToploDemoPresenter >> demo2 [
 	| list colorAssociations |
 
 	(list := ToListElement new)
-		selectionMode: ToListNoneSelectionMode new;
+		selectionMode: (ToListSelectionMode primaryOn: list) disable;
 		nodeBuilder: [ :node :holder |
 			node addChild: (ToLabeledIcon new
 				label: (ToLabel new
diff --git a/src/Toplo-Examples/ToListElementStresser.class.st b/src/Toplo-Examples/ToListElementStresser.class.st
index 4b2d9baf..84ee9989 100644
--- a/src/Toplo-Examples/ToListElementStresser.class.st
+++ b/src/Toplo-Examples/ToListElementStresser.class.st
@@ -120,64 +120,6 @@ ToListElementStresser >> actionDeselectIndexesIn: aList [
 	aList selecter deselectIndexes: selected
 ]
 
-{ #category : #actions }
-ToListElementStresser >> actionDisableAllIn: aList [
-
-	aList disabledSelecter selectAll
-]
-
-{ #category : #actions }
-ToListElementStresser >> actionDisableIndexIn: aList [
-
-	| idx |
-	idx := self randIndexIn: aList.
-	idx isZero ifFalse: [ aList disabledSelecter selectIndex: idx ]
-]
-
-{ #category : #actions }
-ToListElementStresser >> actionDisableIndexesIn: aList [
-
-	| nb selected |
-	nb := (self randIndexIn: aList) min: 30.
-	nb isZero ifTrue: [ ^ self ].
-	selected := (1 to: nb) collect: [ :i | self randIndexIn: aList ].
-	aList disabledSelecter selectIndexes: selected
-]
-
-{ #category : #actions }
-ToListElementStresser >> actionEnableAllIn: aList [
-
-	aList disabledSelecter deselectAll
-]
-
-{ #category : #actions }
-ToListElementStresser >> actionEnableIndexIn: aList [
-
-	| idx |
-	idx := self randIndexIn: aList.
-	idx isZero ifFalse: [ aList disabledSelecter deselectIndex: idx ]
-]
-
-{ #category : #actions }
-ToListElementStresser >> actionEnableIndexesIn: aList [
-
-	| nb selected |
-	nb := (self randIndexIn: aList) min: 30.
-	nb isZero ifTrue: [ ^ self ].
-	selected := (1 to: nb) collect: [ :i | self randIndexIn: aList ].
-	aList disabledSelecter deselectIndexes: selected
-]
-
-{ #category : #actions }
-ToListElementStresser >> actionHiddenIndexesIn: aList [
-
-	| nb selected |
-	nb := (self randIndexIn: aList) min: 30.
-	nb isZero ifTrue: [ ^ self ].
-	selected := (1 to: nb) collect: [ :i | self randIndexIn: aList ].
-	aList hiddenSelecter selectIndexes: selected
-]
-
 { #category : #actions }
 ToListElementStresser >> actionRemoveAtIn: aList [
 
@@ -238,31 +180,6 @@ ToListElementStresser >> actionSelectOnlyIndexesIn: aList [
 	aList selecter selectOnlyIndexes: selected
 ]
 
-{ #category : #actions }
-ToListElementStresser >> actionSelectableAllIn: aList [
-
-	
-		aList unselectableSelecter deselectAll
-]
-
-{ #category : #actions }
-ToListElementStresser >> actionSelectableIndexIn: aList [
-
-	| idx |
-	idx := self randIndexIn: aList.
-	idx isZero ifFalse: [ aList unselectableSelecter deselectIndex: idx ]
-]
-
-{ #category : #actions }
-ToListElementStresser >> actionSelectableIndexesIn: aList [
-
-	| nb selected |
-	nb := (self randIndexIn: aList) min: 30.
-	nb isZero ifTrue: [ ^ self ].
-	selected := (1 to: nb) collect: [ :i | self randIndexIn: aList ].
-	aList unselectableSelecter deselectIndexes: selected
-]
-
 { #category : #actions }
 ToListElementStresser >> actionShiftSelectionFromIn: aList [
 
@@ -272,36 +189,6 @@ ToListElementStresser >> actionShiftSelectionFromIn: aList [
 	idx isZero ifFalse: [ aList selecter shiftSelection: nb from: idx ]
 ]
 
-{ #category : #actions }
-ToListElementStresser >> actionUnhiddenAllIn: aList [
-
-	aList hiddenSelecter deselectAll
-]
-
-{ #category : #actions }
-ToListElementStresser >> actionUnselectableAllIn: aList [
-
-	aList unselectableSelecter selectAll
-]
-
-{ #category : #actions }
-ToListElementStresser >> actionUnselectableIndexIn: aList [
-
-	| idx |
-	idx := self randIndexIn: aList.
-	idx isZero ifFalse: [ aList unselectableSelecter selectIndex: idx ]
-]
-
-{ #category : #actions }
-ToListElementStresser >> actionUnselectableIndexesIn: aList [
-
-	| nb selected |
-	nb := (self randIndexIn: aList) min: 30.
-	nb isZero ifTrue: [ ^ self ].
-	selected := (1 to: nb) collect: [ :i | self randIndexIn: aList ].
-	aList unselectableSelecter selectIndexes: selected
-]
-
 { #category : #private }
 ToListElementStresser >> afterRoundInList: aList [
 
@@ -357,7 +244,7 @@ ToListElementStresser >> initialize [
 { #category : #accessing }
 ToListElementStresser >> interRoundWaitDuration [
 
-	^ 50 milliSeconds 
+	^ 30 milliSeconds 
 ]
 
 { #category : #accessing }
@@ -398,10 +285,17 @@ ToListElementStresser >> minListSize [
 
 ]
 
+{ #category : #initialization }
+ToListElementStresser >> newListElement [ 
+
+	^ ToListElement new
+]
+
 { #category : #initialization }
 ToListElementStresser >> newStressedListNumber: aNumber [
 
 	| list process size ident priority suffix sieve |
+
 	list := ToListElement new.
 	sieve := ToListElementSieve new.
 	list userData at: #sieve put: sieve.
diff --git a/src/Toplo-Examples/ToListElementStresserWithAdditionalSelecters.class.st b/src/Toplo-Examples/ToListElementStresserWithAdditionalSelecters.class.st
new file mode 100644
index 00000000..cebf25ec
--- /dev/null
+++ b/src/Toplo-Examples/ToListElementStresserWithAdditionalSelecters.class.st
@@ -0,0 +1,135 @@
+Class {
+	#name : #ToListElementStresserWithAdditionalSelecters,
+	#superclass : #ToListElementStresser,
+	#category : #'Toplo-Examples'
+}
+
+{ #category : #running }
+ToListElementStresserWithAdditionalSelecters class >> runInSDL [
+
+	<script>
+	self new runInHost: BlOSWindowSDL2Host new
+]
+
+{ #category : #actions }
+ToListElementStresserWithAdditionalSelecters >> actionDisableAllIn: aList [
+
+	aList disabledSelecter selectAll
+]
+
+{ #category : #actions }
+ToListElementStresserWithAdditionalSelecters >> actionDisableIndexIn: aList [
+
+	| idx |
+	idx := self randIndexIn: aList.
+	idx isZero ifFalse: [ aList disabledSelecter selectIndex: idx ]
+]
+
+{ #category : #actions }
+ToListElementStresserWithAdditionalSelecters >> actionDisableIndexesIn: aList [
+
+	| nb selected |
+	nb := (self randIndexIn: aList) min: 30.
+	nb isZero ifTrue: [ ^ self ].
+	selected := (1 to: nb) collect: [ :i | self randIndexIn: aList ].
+	aList disabledSelecter selectIndexes: selected
+]
+
+{ #category : #actions }
+ToListElementStresserWithAdditionalSelecters >> actionEnableAllIn: aList [
+
+	aList disabledSelecter deselectAll
+]
+
+{ #category : #actions }
+ToListElementStresserWithAdditionalSelecters >> actionEnableIndexIn: aList [
+
+	| idx |
+	idx := self randIndexIn: aList.
+	idx isZero ifFalse: [ aList disabledSelecter deselectIndex: idx ]
+]
+
+{ #category : #actions }
+ToListElementStresserWithAdditionalSelecters >> actionEnableIndexesIn: aList [
+
+	| nb selected |
+	nb := (self randIndexIn: aList) min: 30.
+	nb isZero ifTrue: [ ^ self ].
+	selected := (1 to: nb) collect: [ :i | self randIndexIn: aList ].
+	aList disabledSelecter deselectIndexes: selected
+]
+
+{ #category : #actions }
+ToListElementStresserWithAdditionalSelecters >> actionHiddenIndexesIn: aList [
+
+	| nb selected |
+	nb := (self randIndexIn: aList) min: 30.
+	nb isZero ifTrue: [ ^ self ].
+	selected := (1 to: nb) collect: [ :i | self randIndexIn: aList ].
+	aList hiddenSelecter selectIndexes: selected
+]
+
+{ #category : #actions }
+ToListElementStresserWithAdditionalSelecters >> actionSelectableAllIn: aList [
+
+	
+		aList unselectableSelecter deselectAll
+]
+
+{ #category : #actions }
+ToListElementStresserWithAdditionalSelecters >> actionSelectableIndexIn: aList [
+
+	| idx |
+	idx := self randIndexIn: aList.
+	idx isZero ifFalse: [ aList unselectableSelecter deselectIndex: idx ]
+]
+
+{ #category : #actions }
+ToListElementStresserWithAdditionalSelecters >> actionSelectableIndexesIn: aList [
+
+	| nb selected |
+	nb := (self randIndexIn: aList) min: 30.
+	nb isZero ifTrue: [ ^ self ].
+	selected := (1 to: nb) collect: [ :i | self randIndexIn: aList ].
+	aList unselectableSelecter deselectIndexes: selected
+]
+
+{ #category : #actions }
+ToListElementStresserWithAdditionalSelecters >> actionUnhiddenAllIn: aList [
+
+	aList hiddenSelecter deselectAll
+]
+
+{ #category : #actions }
+ToListElementStresserWithAdditionalSelecters >> actionUnselectableAllIn: aList [
+
+	aList unselectableSelecter selectAll
+]
+
+{ #category : #actions }
+ToListElementStresserWithAdditionalSelecters >> actionUnselectableIndexIn: aList [
+
+	| idx |
+	idx := self randIndexIn: aList.
+	idx isZero ifFalse: [ aList unselectableSelecter selectIndex: idx ]
+]
+
+{ #category : #actions }
+ToListElementStresserWithAdditionalSelecters >> actionUnselectableIndexesIn: aList [
+
+	| nb selected |
+	nb := (self randIndexIn: aList) min: 30.
+	nb isZero ifTrue: [ ^ self ].
+	selected := (1 to: nb) collect: [ :i | self randIndexIn: aList ].
+	aList unselectableSelecter selectIndexes: selected
+]
+
+{ #category : #initialization }
+ToListElementStresserWithAdditionalSelecters >> newListElement [
+
+	^ super newListElement
+		  withHiddenSelecter;
+		  withUnselectableSelecter;
+		  withDisabledSelecter;
+		  yourself
+]
diff --git a/src/Toplo-Examples/ToSandBox.class.st b/src/Toplo-Examples/ToSandBox.class.st
index 6cdb2aba..8f3b1d60 100644
--- a/src/Toplo-Examples/ToSandBox.class.st
+++ b/src/Toplo-Examples/ToSandBox.class.st
@@ -691,7 +691,7 @@ ToSandBox class >> example_List2WithAllClassesMono [
 
 	| l |
 	l := ToListElement new.
-	l selectionMode: (ToListSingleSelectionMode new operator: (ToPrimarySelectionModelOperator new selectionModel: l selectionModel)).
+	l selectionMode: (ToListSelectionMode primaryOn: l) beSingleSelection.
 	l dataAccessor addAll:
 		(Smalltalk globals allClasses collect: [ :cls | cls name ]).
 	l openInSpace
@@ -714,7 +714,7 @@ ToSandBox class >> example_List2WithAllClassesNone [
 
 	| l |
 	l := ToListElement new.
-	l selectionMode: ToListNoneSelectionMode new.
+	l selectionMode: (ToListSelectionMode primaryOn: l) disable.
 	l dataAccessor addAll:
 		(Smalltalk globals allClasses collect: [ :cls | cls name ]).
 	l openInSpace
@@ -1365,6 +1365,7 @@ ToSandBox class >> example_SelectMonoNotFiltrableWithGroups [
 
 	| select innerWindow phtext |
 	select := ToSelectElement new.
+	select inspect.
 	select listElement placeholderMinHeight: 35.
 	phtext := ('No Data' asRopedText
 		           foreground: Color lightGray;
@@ -1397,7 +1398,7 @@ ToSandBox class >> example_SelectMultiFiltrable [
 
 	| select innerWindow |
 	select := ToSelectElement new.
-	select maxSelectedCount: 4.
+	"select maxSelectedCount: 4."
 
 	select inspect.
 	select hideSelected: false.
@@ -1421,7 +1422,8 @@ ToSandBox class >> example_SelectMultiFiltrableNoWrapping [
 
 	| select innerWindow |
 	select := ToSelectElement new.
-	select maxSelectedCount: 3.
+	select inspect.
+	select maxSelectedCount: 6.
 	select nodeWrapping: false.
 	select hideSelected: false.
 	select dataAccessor addAll: self statesOfAmerica.
@@ -1443,6 +1445,7 @@ ToSandBox class >> example_SelectMultiFiltrableWithHideSelected [
 
 	| select innerWindow |
 	select := ToSelectElement new.
+	select inspect.
 	select hideSelected: true.
 	select dataAccessor updateAllWith: self statesOfAmerica.
 	select strategy: ToMultipleSelectStrategy new.
@@ -1712,8 +1715,7 @@ ToSandBox class >> example_SieveOnList2With_AllMethods_MonoSelection [
 	| listElement assoc |
 	assoc := self example_SieveOnList2With_AllMethods.
 	listElement := assoc key.
-	listElement selectionMode: (ToListSingleSelectionMode new operator:
-			 (ToPrimarySelectionModelOperator new selectionModel: listElement selectionModel))
+	listElement selectionMode: (ToListSelectionMode primaryOn: listElement) beSingleSelection
 ]
 
 { #category : #list }
diff --git a/src/Toplo-Widget-List-Tests/ToListElementTest.class.st b/src/Toplo-Widget-List-Tests/ToListElementTest.class.st
index 9fa91c79..d4cbc54b 100644
--- a/src/Toplo-Widget-List-Tests/ToListElementTest.class.st
+++ b/src/Toplo-Widget-List-Tests/ToListElementTest.class.st
@@ -113,9 +113,7 @@ ToListElementTest >> testEmptyListAddOrRemoveNextInSelection [
 
 	| l |
 	l := ToListElement new.
-	l selectionMode: (ToListMultipleSelectionMode new operator:
-			 (ToPrimarySelectionModelOperator new selectionModel:
-				  l selectionModel)).
+	l selectionMode: (ToListSelectionMode primaryOn: l) beMultipleSelection.
 	l fitContent.
 	self assert: l dataAccessor isEmpty.
 	l forceLayout.
@@ -129,9 +127,7 @@ ToListElementTest >> testEmptyListAddOrRemovePreviousInSelection [
 
 	| l |
 	l := ToListElement new.
-	l selectionMode: (ToListMultipleSelectionMode new operator:
-			 (ToPrimarySelectionModelOperator new selectionModel:
-				  l selectionModel)).
+	l selectionMode: (ToListSelectionMode primaryOn: l) beMultipleSelection.
 	l fitContent.
 	self assert: l dataAccessor isEmpty.
 	l forceLayout.
diff --git a/src/Toplo-Widget-List-Tests/ToMultiSelectionModelSelecterTest.class.st b/src/Toplo-Widget-List-Tests/ToMultiSelectionModelSelecterTest.class.st
index d9e70f7f..bd8777e9 100644
--- a/src/Toplo-Widget-List-Tests/ToMultiSelectionModelSelecterTest.class.st
+++ b/src/Toplo-Widget-List-Tests/ToMultiSelectionModelSelecterTest.class.st
@@ -75,7 +75,7 @@ ToMultiSelectionModelSelecterTest >> testSelectAll [
 	selecter selectAll.
 	self waitTestingSpaces.
 	self assert: holder selectionModel isNotEmpty.
-	self assert: selecter currentIndex equals: 1
+	self assert: selecter currentIndex equals: holder selectionModel itemCount
 ]
 
 { #category : #tests }
@@ -98,6 +98,7 @@ ToMultiSelectionModelSelecterTest >> testSelectAndScrollToNext [
 	selecter selectIndex: 2.
 	self waitTestingSpaces.
 	selecter selectIndex: selecter nextSelectableIndex.
+	self waitTestingSpaces.
 	selecter scrollToIndex: selecter currentIndex.
 	self waitTestingSpaces.
 	self
@@ -133,6 +134,7 @@ ToMultiSelectionModelSelecterTest >> testSelectAndScrollToPrevious [
 	selecter selectIndex: 2.
 	self waitTestingSpaces.
 	selecter selectIndex: selecter previousSelectableIndex.
+	self waitTestingSpaces.
 	selecter scrollToIndex: selecter currentIndex.
 	self waitTestingSpaces.
 	self
@@ -214,6 +216,7 @@ ToMultiSelectionModelSelecterTest >> testSelectNextOnLastIndex [
 		assert: selecter currentIndex
 		equals: holder dataSource itemCount.
 	selecter selectIndex: selecter nextSelectableIndex.
+	self waitTestingSpaces.
 	selecter scrollToIndex: selecter currentIndex.
 	self waitTestingSpaces.
 	self
@@ -249,6 +252,7 @@ ToMultiSelectionModelSelecterTest >> testSelectPreviousOnFirstIndex [
 	self waitTestingSpaces.
 	self assert: selecter currentIndex equals: 1.
 	selecter selectIndex: selecter previousSelectableIndex.
+	self waitTestingSpaces.
 	selecter scrollToIndex: selecter currentIndex.
 	self waitTestingSpaces.
 	self
diff --git a/src/Toplo-Widget-List-Tests/ToSelectionModelHolderForTest.class.st b/src/Toplo-Widget-List-Tests/ToSelectionModelHolderForTest.class.st
index 320e6a2f..72094475 100644
--- a/src/Toplo-Widget-List-Tests/ToSelectionModelHolderForTest.class.st
+++ b/src/Toplo-Widget-List-Tests/ToSelectionModelHolderForTest.class.st
@@ -67,13 +67,10 @@ ToSelectionModelHolderForTest >> initialize [
 	unselectableSelectionModel := self defaultSelectionModel.
 	unselectableSelectionModel onInstalledIn: self.
 	self addEventHandler: ToElementCommandEventHandler new.
-	operator := ToPrimarySelectionModelOperator new.
-	operator onInstalledIn: self.
-	operator selectionModel: self selectionModel.
+	operator := ToPrimarySelectionModelOperator on: self.
 	self addEventHandler: (BlEventHandler
 			 on: ToListPrimarySelectionChangedEvent
-			 do: [ :event | self successfulCommand: true ]).
-
+			 do: [ :event | self successfulCommand: true ])
 ]
 
 { #category : #accessing }
@@ -91,18 +88,15 @@ ToSelectionModelHolderForTest >> layoutCritical: aBlock [
 { #category : #accessing }
 ToSelectionModelHolderForTest >> multiSelectionSelecter [
 
-	selecter := ToMultiSelectionModelSelecter new.
-	selecter onInstalledIn: self.
-	selecter operator: operator.
-	^ selecter
+	^ (ToPredefinedSelecter
+		   selectionModel: self selectionModel
+		   operator: operator) multiple: true
 ]
 
 { #category : #accessing }
 ToSelectionModelHolderForTest >> noneSelectionSelecter [
 
-	selecter := ToNoneSelectionModelSelecter new.
-	selecter onInstalledIn: self.
-	^ selecter
+	^ selecter := ToNoneSelecter new
 ]
 
 { #category : #'event firing' }
@@ -120,11 +114,7 @@ ToSelectionModelHolderForTest >> notifyUnselectableSelectionChanged: anEvent [
 { #category : #accessing }
 ToSelectionModelHolderForTest >> operator [
 
-	| operator |
-	operator := ToPrimarySelectionModelOperator new.
-	operator onInstalledIn: self.
-	operator selectionModel: self selectionModel.
-	^ operator
+	^ ToPrimarySelectionModelOperator on: self
 ]
 
 { #category : #accessing }
@@ -154,10 +144,9 @@ ToSelectionModelHolderForTest >> selectionModel [
 { #category : #accessing }
 ToSelectionModelHolderForTest >> singleSelectionSelecter [
 
-	selecter := ToSingleSelectionModelSelecter new.
-	selecter onInstalledIn: self.
-	selecter operator: operator.
-	^ selecter
+	^ (ToPredefinedSelecter
+		   selectionModel: self selectionModel
+		   operator: operator) multiple: false
 ]
 
 { #category : #accessing }
diff --git a/src/Toplo-Widget-List-Tests/ToSelectionModelOperatorTest.class.st b/src/Toplo-Widget-List-Tests/ToSelectionModelOperatorTest.class.st
index 24e7c5e4..74b37cee 100644
--- a/src/Toplo-Widget-List-Tests/ToSelectionModelOperatorTest.class.st
+++ b/src/Toplo-Widget-List-Tests/ToSelectionModelOperatorTest.class.st
@@ -33,6 +33,7 @@ ToSelectionModelOperatorTest >> testAddCommand [
 
 	operator addCommand: (cmd := ToWholeSelectionCommand new
 			        operator: operator;
+			selectionModel: holder selectionModel;
 			        operation: ToAddSelectionOperation new;
 			        yourself).
 	self waitTestingSpaces.
@@ -48,6 +49,7 @@ ToSelectionModelOperatorTest >> testDeselectTo [
 	self assert: holder selectionModel selectedIndexes equals: #( 1001 ).
 	operator addCommand: (cmd := ToIntervalSelectionCommand new
 			        operator: operator;
+			        selectionModel: holder selectionModel;
 			        from: 1;
 			        to: holder itemCount + 1;
 			        operation: ToRemoveSelectionOperation new;
@@ -68,6 +70,7 @@ ToSelectionModelOperatorTest >> testDeselectToWithChangedItemCount [
 	self assert: holder selectionModel itemCount equals: 0.
 	operator addCommand: (cmd := ToIntervalSelectionCommand new
 			        operator: operator;
+			        selectionModel: holder selectionModel;
 			        from: 1;
 			        to: to;
 			        operation: ToRemoveSelectionOperation new;
diff --git a/src/Toplo-Widget-List-Tests/ToSingleSelectionModelSelecterTest.class.st b/src/Toplo-Widget-List-Tests/ToSingleSelectionModelSelecterTest.class.st
index be76729a..a925a2f0 100644
--- a/src/Toplo-Widget-List-Tests/ToSingleSelectionModelSelecterTest.class.st
+++ b/src/Toplo-Widget-List-Tests/ToSingleSelectionModelSelecterTest.class.st
@@ -110,7 +110,12 @@ ToSingleSelectionModelSelecterTest >> testSelectAndScrollToNext [
 
 	selecter selectIndex: 2.
 	self waitTestingSpaces.
+	self assert: selecter currentIndex equals: 2.
+
 	selecter selectIndex: selecter nextSelectableIndex.
+	self waitTestingSpaces.
+	self assert: selecter currentIndex equals: 3.
+
 	selecter scrollToIndex: selecter currentIndex.
 	self waitTestingSpaces.
 	self
@@ -147,12 +152,14 @@ ToSingleSelectionModelSelecterTest >> testSelectAndScrollToPrevious [
 	selecter selectIndex: 2.
 	self waitTestingSpaces.
 	selecter selectIndex: selecter previousSelectableIndex.
+	self waitTestingSpaces.
 	selecter scrollToIndex: selecter currentIndex.
 	self waitTestingSpaces.
 	self
 		assert: holder selectionModel selectedIndexes asSet
 		equals: #( 1 ) asSet.
 	self assert: selecter currentIndex equals: 1.
+	self waitTestingSpaces.
 	self assert: holder scrollIndex equals: 1
 ]
 
@@ -219,6 +226,7 @@ ToSingleSelectionModelSelecterTest >> testSelectNextOnLastIndex [
 		assert: selecter currentIndex
 		equals: holder dataSource itemCount.
 	selecter selectIndex: selecter nextSelectableIndex.
+	self waitTestingSpaces.
 	selecter scrollToIndex: selecter currentIndex.
 	self waitTestingSpaces.
 	self
@@ -251,6 +259,7 @@ ToSingleSelectionModelSelecterTest >> testSelectPreviousOnFirstIndex [
 	self waitTestingSpaces.
 	self assert: selecter currentIndex equals: 1.
 	selecter selectIndex: selecter previousSelectableIndex.
+	self waitTestingSpaces.
 	selecter scrollToIndex: selecter currentIndex.
 	self waitTestingSpaces.
 	self
diff --git a/src/Toplo-Widget-List/TToListElementDecorator.trait.st b/src/Toplo-Widget-List/TToListElementDecorator.trait.st
index ec434110..1c9a2918 100644
--- a/src/Toplo-Widget-List/TToListElementDecorator.trait.st
+++ b/src/Toplo-Widget-List/TToListElementDecorator.trait.st
@@ -36,12 +36,6 @@ TToListElementDecorator >> infinite [
 	^ self next infinite
 ]
 
-{ #category : #'t - infinite accessing' }
-TToListElementDecorator >> layoutCritical: aBlock [
-
-	self next layoutCritical: aBlock
-]
-
 { #category : #'t - accessing constraints' }
 TToListElementDecorator >> maxHeight: aHeight [
 
diff --git a/src/Toplo-Widget-List/ToAbstractListElement.class.st b/src/Toplo-Widget-List/ToAbstractListElement.class.st
index f702955e..64371b3c 100644
--- a/src/Toplo-Widget-List/ToAbstractListElement.class.st
+++ b/src/Toplo-Widget-List/ToAbstractListElement.class.st
@@ -5,7 +5,6 @@ Class {
 	#classTraits : 'TToListElementDecorator classTrait + TToElementWithPlaceholder classTrait',
 	#instVars : [
 		'selectionMode',
-		'selectionModel',
 		'sharedEventDistributors',
 		'dataSource'
 	],
@@ -131,9 +130,7 @@ ToAbstractListElement >> defaultNodeReleaser [
 { #category : #initialization }
 ToAbstractListElement >> defaultSelectionMode [
 
-	^ ToListMultipleSelectionMode new operator:
-		  (ToPrimarySelectionModelOperator new selectionModel:
-			   self selectionModel)
+	^ (ToListSelectionMode primaryOn: self) beMultipleSelection 
 ]
 
 { #category : #orientation }
@@ -160,7 +157,6 @@ ToAbstractListElement >> initialize [
 	self next: self defaultInfiniteElement.
 	self next elevation: (BlRelativeElevation elevation: 10).
 
-	self initializeSelectionModel.
 	self layout: self defaultLayout.	
 
 	self selectionMode: self defaultSelectionMode.
@@ -183,12 +179,6 @@ ToAbstractListElement >> initializeDataSource [
 	self dataSource: self defaultDataSource
 ]
 
-{ #category : #initialization }
-ToAbstractListElement >> initializeSelectionModel [
-
-	self selectionModel: self newPrimarySelectionModel
-]
-
 { #category : #initialization }
 ToAbstractListElement >> installSharedEventDistributors [
 	"installs shared event distributors between the list element, the selection strategy,
@@ -313,15 +303,6 @@ ToAbstractListElement >> primarySelectionElements [
 				  stream nextPut: child ] ] ]
 ]
 
-{ #category : #accessing }
-ToAbstractListElement >> secondarySelectionElements [
-
-	^ Array streamContents: [ :stream |
-		  self childrenDo: [ :child |
-			  (child isKindOf: ToListSecondarySelectionElement) ifTrue: [
-				  stream nextPut: child ] ] ]
-]
-
 { #category : #accessing }
 ToAbstractListElement >> selecter [ 
 
@@ -349,15 +330,7 @@ ToAbstractListElement >> selectionMode: aSelectionMode [
 { #category : #accessing }
 ToAbstractListElement >> selectionModel [
 
-	^ selectionModel
-]
-
-{ #category : #accessing }
-ToAbstractListElement >> selectionModel: aSelectionModel [
-
-	selectionModel ifNotNil: [ selectionModel onUninstalledIn: self ].
-	selectionModel := aSelectionModel.
-	selectionModel ifNotNil: [selectionModel onInstalledIn: self ]
+	^ self selectionMode selectionModel
 ]
 
 { #category : #initialization }
diff --git a/src/Toplo-Widget-List/ToAbstractListElementSelecter.class.st b/src/Toplo-Widget-List/ToAbstractListElementSelecter.class.st
new file mode 100644
index 00000000..c4c899e0
--- /dev/null
+++ b/src/Toplo-Widget-List/ToAbstractListElementSelecter.class.st
@@ -0,0 +1,119 @@
+Class {
+	#name : #ToAbstractListElementSelecter,
+	#superclass : #Object,
+	#category : #'Toplo-Widget-List-Selection-Selecter'
+}
+
+{ #category : #testing }
+ToAbstractListElementSelecter >> containsIndex: anIndex [
+
+	^ self subclassResponsibility 
+]
+
+{ #category : #copying }
+ToAbstractListElementSelecter >> copySelectionFrom: aSourceSelectionModel [
+
+	self subclassResponsibility 
+]
+
+{ #category : #accessing }
+ToAbstractListElementSelecter >> currentIndex [
+
+	^ self subclassResponsibility 
+]
+
+{ #category : #operations }
+ToAbstractListElementSelecter >> deselectAll [
+
+	self subclassResponsibility 
+]
+
+{ #category : #operations }
+ToAbstractListElementSelecter >> deselectIndex: anIndex [
+
+	self subclassResponsibility 
+]
+
+{ #category : #operations }
+ToAbstractListElementSelecter >> deselectIndex: aStartIndex to: anEndIndex [
+
+	self subclassResponsibility
+]
+
+{ #category : #operations }
+ToAbstractListElementSelecter >> deselectIndexes: anArray [
+
+	self subclassResponsibility 
+]
+
+{ #category : #private }
+ToAbstractListElementSelecter >> nextDeselectedIndex [
+
+	^ self subclassResponsibility 
+]
+
+{ #category : #private }
+ToAbstractListElementSelecter >> nextSelectableIndex [
+
+	^ self subclassResponsibility 
+]
+
+{ #category : #private }
+ToAbstractListElementSelecter >> previousDeselectedIndex [
+
+	^ self subclassResponsibility 
+]
+
+{ #category : #private }
+ToAbstractListElementSelecter >> previousSelectableIndex [
+
+	^ self subclassResponsibility
+]
+
+{ #category : #operations }
+ToAbstractListElementSelecter >> scrollToIndex: anIndex [
+
+	self subclassResponsibility 
+]
+
+{ #category : #operations }
+ToAbstractListElementSelecter >> selectAll [
+
+	self subclassResponsibility 
+]
+
+{ #category : #operations }
+ToAbstractListElementSelecter >> selectIndex: anIndex [
+
+	self subclassResponsibility 
+]
+
+{ #category : #operations }
+ToAbstractListElementSelecter >> selectIndex: aStartIndex to: anEndIndex [
+
+	self subclassResponsibility 
+]
+
+{ #category : #operations }
+ToAbstractListElementSelecter >> selectIndexes: anArray [
+
+	self subclassResponsibility 
+]
+
+{ #category : #operations }
+ToAbstractListElementSelecter >> selectOnlyIndex: anIndex [
+
+	self subclassResponsibility 
+]
+
+{ #category : #operations }
+ToAbstractListElementSelecter >> selectOnlyIndexes: anArray [
+
+	self subclassResponsibility 
+]
+
+{ #category : #accessing }
+ToAbstractListElementSelecter >> selectedIndexes [ 
+
+	^ self subclassResponsibility 
+]
diff --git a/src/Toplo-Widget-List/ToAbstractSelectionModelSelecter.class.st b/src/Toplo-Widget-List/ToAbstractSelectionModelSelecter.class.st
deleted file mode 100644
index 3a142dfc..00000000
--- a/src/Toplo-Widget-List/ToAbstractSelectionModelSelecter.class.st
+++ /dev/null
@@ -1,127 +0,0 @@
-Class {
-	#name : #ToAbstractSelectionModelSelecter,
-	#superclass : #Object,
-	#category : #'Toplo-Widget-List-Selection-Selecter'
-}
-
-{ #category : #copying }
-ToAbstractSelectionModelSelecter >> copySelectionFrom: aSourceSelectionModel [
-
-	self subclassResponsibility 
-]
-
-{ #category : #accessing }
-ToAbstractSelectionModelSelecter >> currentIndex [ 
-
-	^ self subclassResponsibility 
-]
-
-{ #category : #operations }
-ToAbstractSelectionModelSelecter >> deselectAll [
-
-	self subclassResponsibility 
-]
-
-{ #category : #operations }
-ToAbstractSelectionModelSelecter >> deselectIndex: anIndex [
-
-	self subclassResponsibility 
-]
-
-{ #category : #operations }
-ToAbstractSelectionModelSelecter >> deselectIndex: aStartIndex to: anEndIndex [
-
-	self subclassResponsibility
-]
-
-{ #category : #operations }
-ToAbstractSelectionModelSelecter >> deselectIndexes: anArray [
-
-	self subclassResponsibility 
-]
-
-{ #category : #private }
-ToAbstractSelectionModelSelecter >> nextDeselectedIndex [
-
-	^ self subclassResponsibility 
-]
-
-{ #category : #private }
-ToAbstractSelectionModelSelecter >> nextSelectableIndex [
-
-	^ self subclassResponsibility 
-]
-
-{ #category : #'api - hooks' }
-ToAbstractSelectionModelSelecter >> onInstalledIn: anEventTarget [
-]
-
-{ #category : #'api - hooks' }
-ToAbstractSelectionModelSelecter >> onUninstalledIn: anEventTarget [
-]
-
-{ #category : #accessing }
-ToAbstractSelectionModelSelecter >> operateSilently [
-
-	^ false
-]
-
-{ #category : #private }
-ToAbstractSelectionModelSelecter >> previousDeselectedIndex [
-
-	^ self subclassResponsibility 
-]
-
-{ #category : #private }
-ToAbstractSelectionModelSelecter >> previousSelectableIndex [
-
-	^ self subclassResponsibility
-]
-
-{ #category : #operations }
-ToAbstractSelectionModelSelecter >> scrollToIndex: anIndex [
-
-	self subclassResponsibility 
-]
-
-{ #category : #operations }
-ToAbstractSelectionModelSelecter >> selectAll [
-
-	self subclassResponsibility 
-]
-
-{ #category : #operations }
-ToAbstractSelectionModelSelecter >> selectIndex: anIndex [
-
-	self subclassResponsibility 
-]
-
-{ #category : #operations }
-ToAbstractSelectionModelSelecter >> selectIndex: aStartIndex to: anEndIndex [
-
-	self subclassResponsibility 
-]
-
-{ #category : #operations }
-ToAbstractSelectionModelSelecter >> selectIndexes: anArray [
-
-	self subclassResponsibility 
-]
-
-{ #category : #operations }
-ToAbstractSelectionModelSelecter >> selectOnlyIndex: anIndex [
-
-	self subclassResponsibility 
-]
-
-{ #category : #operations }
-ToAbstractSelectionModelSelecter >> selectOnlyIndexes: anArray [
-
-	self subclassResponsibility 
-]
-
-{ #category : #accessing }
-ToAbstractSelectionModelSelecter >> selectedIndexes [
-
-	^ self subclassResponsibility 
-]
diff --git a/src/Toplo-Widget-List/ToAdditionalSelecter.class.st b/src/Toplo-Widget-List/ToAdditionalSelecter.class.st
new file mode 100644
index 00000000..c75e5acd
--- /dev/null
+++ b/src/Toplo-Widget-List/ToAdditionalSelecter.class.st
@@ -0,0 +1,61 @@
+Class {
+	#name : #ToAdditionalSelecter,
+	#superclass : #ToEffectiveSelecter,
+	#instVars : [
+		'eventClass',
+		'uniqueId'
+	],
+	#category : #'Toplo-Widget-List-Selection-Selecter'
+}
+
+{ #category : #'instance creation' }
+ToAdditionalSelecter class >> on: aListElement [
+
+	^ self new
+		  onInstalledIn: aListElement;
+		  yourself
+]
+
+{ #category : #accessing }
+ToAdditionalSelecter >> eventClass [
+
+	^ eventClass
+]
+
+{ #category : #accessing }
+ToAdditionalSelecter >> eventClass: anEventClass [
+
+	eventClass := anEventClass
+]
+
+{ #category : #'api - hooks' }
+ToAdditionalSelecter >> onInstalledIn: aListElement [
+
+	operator := ToAdditionalSelectionModelOperator on: aListElement withEventClass: self eventClass.
+	selectionModel := aListElement newAdditionalSelectionModel.
+	selectionModel onInstalledIn: aListElement.
+	aListElement recordAdditionalSelecter: self.
+	self beMultipleSelection.
+
+]
+
+{ #category : #'api - hooks' }
+ToAdditionalSelecter >> onUninstalledIn: aListElement [
+
+	aListElement unrecordAdditionalSelecter: self.
+	operator onUninstalledIn: aListElement.
+	selectionModel onUninstalledIn: aListElement.
+
+]
+
+{ #category : #accessing }
+ToAdditionalSelecter >> uniqueId [
+
+	^ uniqueId
+]
+
+{ #category : #accessing }
+ToAdditionalSelecter >> uniqueId: aSymbol [
+
+	uniqueId := aSymbol
+]
diff --git a/src/Toplo-Widget-List/ToAdditionalSelectionModelOperator.class.st b/src/Toplo-Widget-List/ToAdditionalSelectionModelOperator.class.st
index e1e894a3..9b70def4 100644
--- a/src/Toplo-Widget-List/ToAdditionalSelectionModelOperator.class.st
+++ b/src/Toplo-Widget-List/ToAdditionalSelectionModelOperator.class.st
@@ -7,10 +7,13 @@ Class {
 	#category : #'Toplo-Widget-List-Command-Selection'
 }
 
-{ #category : #accessing }
-ToAdditionalSelectionModelOperator class >> eventClass: anEventClass [
+{ #category : #instanceCreation }
+ToAdditionalSelectionModelOperator class >> on: anElement withEventClass: anEventClass [
 
-	^ self new eventClass: anEventClass
+	^ self new
+		  eventClass: anEventClass;
+		  onInstalledIn: anElement;
+		  yourself
 ]
 
 { #category : #accessing }
@@ -31,6 +34,6 @@ ToAdditionalSelectionModelOperator >> notifySelectionChangedAfter: aCommand in:
 	aCommand selectionChanged ifFalse: [ ^ self ].
 
 	aTarget dispatchEvent: (self eventClass new
-			 selectionModel: self selectionModel;
+			 selectionModel: aCommand selectionModel;
 			 yourself)
 ]
diff --git a/src/Toplo-Widget-List/ToBasicListElement.class.st b/src/Toplo-Widget-List/ToBasicListElement.class.st
index 0e34e74f..c47aa1a9 100644
--- a/src/Toplo-Widget-List/ToBasicListElement.class.st
+++ b/src/Toplo-Widget-List/ToBasicListElement.class.st
@@ -83,6 +83,14 @@ ToBasicListElement >> initialize [
 	nodeReleaser := self defaultNodeReleaser 
 ]
 
+{ #category : #'instance creation' }
+ToBasicListElement >> newAdditionalSelectionModel [
+
+	^ ToSelectionModel new
+		  itemCountGetter: [ self dataSource itemCount ];
+		  yourself
+]
+
 { #category : #'instance creation' }
 ToBasicListElement >> newPrimarySelectionModel [
 
diff --git a/src/Toplo-Widget-List/ToCommandOperator.class.st b/src/Toplo-Widget-List/ToCommandOperator.class.st
index 401c703a..64b63eb1 100644
--- a/src/Toplo-Widget-List/ToCommandOperator.class.st
+++ b/src/Toplo-Widget-List/ToCommandOperator.class.st
@@ -1,11 +1,11 @@
 Class {
 	#name : #ToCommandOperator,
 	#superclass : #Object,
-	#traits : 'TBlEventTarget',
 	#classTraits : 'TBlEventTarget classTrait',
 	#instVars : [
 		'eventDispatcher',
-		'sharedEventDistributor'
+		'sharedEventDistributor',
+		'element'
 	],
 	#category : #'Toplo-Widget-List-Command-Selection'
 }
@@ -24,19 +24,11 @@ ToCommandOperator >> applyCommand: aCommand in: aTarget [
 	aCommand applyOn: aCommand operator in: aTarget
 ]
 
-{ #category : #'event management accessing' }
-ToCommandOperator >> eventDispatcher [
-	"Return an object responsible for event dispatching"
-	<return: #BlDirectEventDispatcher>
+{ #category : #'event management' }
+ToCommandOperator >> dispatchEvent: anEvent [
+	"I only call my event dispatcher, so the event can be only handled by my event handlers/filters"
 
-	^ eventDispatcher 
-]
-
-{ #category : #initialization }
-ToCommandOperator >> initialize [ 
-
-	super initialize.
-	eventDispatcher := BlDirectEventDispatcher on: self
+	element dispatchEvent: anEvent
 ]
 
 { #category : #'command operations' }
@@ -45,23 +37,15 @@ ToCommandOperator >> listScrollCommand: aCommand in: aTarget [
 ]
 
 { #category : #'api - hooks' }
-ToCommandOperator >> onInstalledIn: anEventTarget [
+ToCommandOperator >> onInstalledIn: anElement [
 
-	sharedEventDistributor ifNotNil: [ Error signal: 'A CommandTarget can be installed only once' ].
-	sharedEventDistributor := BlSharedEventDistributor new
-		                          shareEvents: self sharedEvents;
-		                          yourself.
-	self addEventHandler: sharedEventDistributor.
-	anEventTarget addEventHandler: sharedEventDistributor
+	element := anElement 
 ]
 
 { #category : #'api - hooks' }
 ToCommandOperator >> onUninstalledIn: anEventTarget [
 
-	sharedEventDistributor ifNil: [ Error signal: 'Not installed' ].
-	self removeEventHandler: sharedEventDistributor.
-	anEventTarget removeEventHandler: sharedEventDistributor.
-	sharedEventDistributor := nil
+	element := nil
 ]
 
 { #category : #accessing }
diff --git a/src/Toplo-Widget-List/ToDisabledSelecter.class.st b/src/Toplo-Widget-List/ToDisabledSelecter.class.st
new file mode 100644
index 00000000..8b2a67f5
--- /dev/null
+++ b/src/Toplo-Widget-List/ToDisabledSelecter.class.st
@@ -0,0 +1,14 @@
+Class {
+	#name : #ToDisabledSelecter,
+	#superclass : #ToAdditionalSelecter,
+	#category : #'Toplo-Widget-List-Selection-Selecter'
+}
+
+{ #category : #initialization }
+ToDisabledSelecter >> initialize [ 
+
+	super initialize.
+	self eventClass: ToListDisabledSelectionChangedEvent.
+	self uniqueId: #disabled
+	
+]
diff --git a/src/Toplo-Widget-List/ToEffectiveSelecter.class.st b/src/Toplo-Widget-List/ToEffectiveSelecter.class.st
new file mode 100644
index 00000000..bb255c57
--- /dev/null
+++ b/src/Toplo-Widget-List/ToEffectiveSelecter.class.st
@@ -0,0 +1,345 @@
+Class {
+	#name : #ToEffectiveSelecter,
+	#superclass : #ToAbstractListElementSelecter,
+	#instVars : [
+		'operator',
+		'selectionModel',
+		'multiple'
+	],
+	#category : #'Toplo-Widget-List-Selection-Selecter'
+}
+
+{ #category : #adding }
+ToEffectiveSelecter >> addCommand: aCommand [
+
+	self operator addCommand: aCommand
+]
+
+{ #category : #adding }
+ToEffectiveSelecter >> addSelectionCommand: aCommand [
+
+	aCommand selectionModel: selectionModel.
+	self addCommand: aCommand
+]
+
+{ #category : #accessing }
+ToEffectiveSelecter >> beMultipleSelection [
+
+	self multiple: true
+]
+
+{ #category : #accessing }
+ToEffectiveSelecter >> beSingleSelection [
+
+	self multiple: false
+]
+
+{ #category : #testing }
+ToEffectiveSelecter >> containsIndex: anIndex [
+
+	^ self selectionModel containsIndex: anIndex
+]
+
+{ #category : #copying }
+ToEffectiveSelecter >> copySelectionFrom: aSourceSelectionModel [
+
+	self addSelectionCommand: (ToSelectionModelCopyFromCommand new
+			 operator: self operator;
+			 sourceSelectionModel: aSourceSelectionModel;
+			 yourself)
+]
+
+{ #category : #accessing }
+ToEffectiveSelecter >> currentIndex [
+
+	^ self operator currentIndex
+]
+
+{ #category : #operations }
+ToEffectiveSelecter >> deselectAll [
+
+	self addSelectionCommand: (ToWholeSelectionCommand new
+			 operator: self operator;
+			 operation: ToRemoveSelectionOperation new;
+			 yourself)
+]
+
+{ #category : #operations }
+ToEffectiveSelecter >> deselectIndex: anIndex [
+
+	self addSelectionCommand: (ToIntervalSelectionCommand new
+			 operator: self operator;
+			 from: anIndex to: anIndex;
+			 operation: ToRemoveSelectionOperation new)
+]
+
+{ #category : #operations }
+ToEffectiveSelecter >> deselectIndex: aStartIndex to: anEndIndex [
+
+	self addSelectionCommand: (ToIntervalSelectionCommand new
+			 operator: self operator;
+			 from: aStartIndex to: anEndIndex;
+			 operation: ToRemoveSelectionOperation new)
+]
+
+{ #category : #operations }
+ToEffectiveSelecter >> deselectIndexes: anArray [
+
+	self addSelectionCommand: (ToIndexesSelectionCommand new
+			 operator: self operator;
+			 indexes: anArray;
+			 operation: ToRemoveSelectionOperation new)
+]
+
+{ #category : #initialization }
+ToEffectiveSelecter >> initialize [ 
+
+	super initialize.
+	multiple := true.
+]
+
+{ #category : #testing }
+ToEffectiveSelecter >> isMultipleSelection [
+
+	^ self multiple
+]
+
+{ #category : #testing }
+ToEffectiveSelecter >> isSingleSelection [
+
+	^ self isMultipleSelection not
+]
+
+{ #category : #accessing }
+ToEffectiveSelecter >> itemCount [
+
+	^ selectionModel itemCount
+]
+
+{ #category : #accessing }
+ToEffectiveSelecter >> multiple [
+
+	^ multiple
+]
+
+{ #category : #accessing }
+ToEffectiveSelecter >> multiple: aBoolean [
+
+	multiple := aBoolean
+]
+
+{ #category : #private }
+ToEffectiveSelecter >> nextDeselectedIndex [
+
+	^ self sideIdx: 1
+]
+
+{ #category : #private }
+ToEffectiveSelecter >> nextSelectableIndex [
+
+	self currentIndex isZero
+		ifTrue: [
+			selectionModel itemCount isZero ifTrue: [ ^ 0 ].
+			^ self nextSelectableIndexStartingAt: 1 ]
+		ifFalse: [
+			self currentIndex
+			< (self previousSelectableIndexStartingAt: selectionModel itemCount)
+				ifFalse: [ ^ self nextSelectableIndexStartingAt: 1 ] ].
+	^ self nextSelectableIndexStartingAt: self currentIndex + 1
+]
+
+{ #category : #private }
+ToEffectiveSelecter >> nextSelectableIndexStartingAt: anIndex [
+
+	^ selectionModel nextSelectableIndexStartingAt: anIndex
+]
+
+{ #category : #private }
+ToEffectiveSelecter >> nextSelectableIndexToScrollTo [
+
+	| next |
+	next := self nextSelectableIndex.
+	" not on the last selectable position -> just return the next index else, return 1 or 0"
+	^ self currentIndex < (self previousSelectableIndexStartingAt: selectionModel itemCount)
+		  ifTrue: [ next ]
+		  ifFalse: [
+			  selectionModel itemCount > 0
+				  ifTrue: [ 1 ]
+				  ifFalse: [ 0 ] ]
+]
+
+{ #category : #accessing }
+ToEffectiveSelecter >> operator [
+
+	^ operator
+]
+
+{ #category : #accessing }
+ToEffectiveSelecter >> operator: aSelectionModelOperator [
+
+	operator := aSelectionModelOperator
+]
+
+{ #category : #private }
+ToEffectiveSelecter >> previousDeselectedIndex [
+
+	^ self sideIdx: -1
+]
+
+{ #category : #private }
+ToEffectiveSelecter >> previousSelectableIndex [
+
+	self currentIndex isZero
+		ifTrue: [
+			selectionModel itemCount isZero ifTrue: [ ^ 0 ].
+			^ self previousSelectableIndexStartingAt: selectionModel itemCount ]
+		ifFalse: [ self currentIndex > (self nextSelectableIndexStartingAt: 1) 
+			ifFalse: [ ^ self previousSelectableIndexStartingAt: selectionModel itemCount ] ].
+	^ self previousSelectableIndexStartingAt: self currentIndex - 1
+]
+
+{ #category : #private }
+ToEffectiveSelecter >> previousSelectableIndexStartingAt: anIndex [
+
+	^ selectionModel previousSelectableIndexStartingAt: anIndex
+]
+
+{ #category : #private }
+ToEffectiveSelecter >> previousSelectableIndexToScrollTo [
+
+	| prev |
+	prev := self previousSelectableIndex.
+	" not exactly on the first selectable position -> just return the previous index else, return self itemCount or 0"
+	^ self currentIndex > (self nextSelectableIndexStartingAt: 1)
+		  ifTrue: [ prev ]
+		  ifFalse: [ selectionModel itemCount max: 0 ]
+]
+
+{ #category : #operations }
+ToEffectiveSelecter >> scrollToIndex: anIndex [
+
+	selectionModel itemCount >= anIndex ifTrue: [
+		self addSelectionCommand: (ToListScrollCommand new
+				 operator: self operator;
+				 index: anIndex;
+				 yourself) ]
+]
+
+{ #category : #operations }
+ToEffectiveSelecter >> selectAll [
+
+	self isMultipleSelection ifFalse: [ ToInvalidElementCommand signal ].
+	self addSelectionCommand: (ToWholeSelectionCommand new
+			 operator: self operator;
+			 operation: ToAddSelectionOperation new;
+			 yourself)
+]
+
+{ #category : #operations }
+ToEffectiveSelecter >> selectIndex: anIndex [
+
+	self addSelectionCommand: (ToIntervalSelectionCommand new
+			 operator: self operator;
+			 from: anIndex to: anIndex;
+			 operation: (ToAddSelectionOperation new
+					  deselectAllBefore: self isSingleSelection;
+					  yourself))
+]
+
+{ #category : #operations }
+ToEffectiveSelecter >> selectIndex: aStartIndex to: anEndIndex [
+
+	self isSingleSelection ifTrue: [
+		aStartIndex ~= anEndIndex ifTrue: [
+			^ ToInvalidElementCommand signal ].
+		self selectIndex: aStartIndex.
+		^ self ].
+
+	self addSelectionCommand: (ToIntervalSelectionCommand new
+			 operator: self operator;
+			 from: aStartIndex to: anEndIndex;
+			 operation: ToAddSelectionOperation new)
+]
+
+{ #category : #operations }
+ToEffectiveSelecter >> selectIndexes: anArray [
+
+	anArray ifEmpty: [ ^ self ].
+
+	self isSingleSelection ifTrue: [
+		anArray size > 1 ifTrue: [ ^ ToInvalidElementCommand signal ].
+		self selectIndex: anArray first.
+		^ self ].
+
+	self addSelectionCommand: (ToIndexesSelectionCommand new
+			 operator: self operator;
+			 indexes: anArray;
+			 operation: ToAddSelectionOperation new)
+]
+
+{ #category : #operations }
+ToEffectiveSelecter >> selectOnlyIndex: anIndex [
+
+	(selectionModel selectedIndexesCount = 1 and: [
+		 selectionModel firstIndex = anIndex ]) ifTrue: [ ^ self ].
+	self addSelectionCommand: (ToIntervalSelectionCommand new
+			 operator: self operator;
+			 from: anIndex to: anIndex;
+			 operation: (ToAddSelectionOperation new
+					  deselectAllBefore: true;
+					  yourself))
+]
+
+{ #category : #operations }
+ToEffectiveSelecter >> selectOnlyIndexes: anArray [
+
+	self isSingleSelection ifTrue: [
+		anArray size > 1 ifTrue: [ ^ ToInvalidElementCommand signal ] ].
+
+	anArray ifEmpty: [
+		self addSelectionCommand: (ToWholeSelectionCommand new
+				 operator: self operator;
+				 operation: ToRemoveSelectionOperation new).
+		^ self ].
+
+	self addSelectionCommand: (ToIndexesSelectionCommand new
+			 operator: self operator;
+			 indexes: anArray;
+			 operation: (ToAddSelectionOperation new
+					  deselectAllBefore: true;
+					  yourself))
+]
+
+{ #category : #accessing }
+ToEffectiveSelecter >> selectedIndexes [
+
+	^ self selectionModel selectedIndexes
+]
+
+{ #category : #accessing }
+ToEffectiveSelecter >> selectionModel [
+
+	^ selectionModel
+]
+
+{ #category : #accessing }
+ToEffectiveSelecter >> selectionModel: aSelectionModel [
+
+	selectionModel := aSelectionModel
+]
+
+{ #category : #operations }
+ToEffectiveSelecter >> shiftSelection: anInteger from: anIndex [
+
+	self addSelectionCommand: (ToSelectionModelShiftCommand new
+			 operator: self operator;
+			 itemCount: anInteger;
+			 fromIndex: anIndex;
+			 yourself)
+]
+
+{ #category : #private }
+ToEffectiveSelecter >> sideIdx: aGap [
+
+	^ selectionModel sideIdx: aGap startingAt: self currentIndex
+]
diff --git a/src/Toplo-Widget-List/ToHiddenSelecter.class.st b/src/Toplo-Widget-List/ToHiddenSelecter.class.st
new file mode 100644
index 00000000..be87f395
--- /dev/null
+++ b/src/Toplo-Widget-List/ToHiddenSelecter.class.st
@@ -0,0 +1,14 @@
+Class {
+	#name : #ToHiddenSelecter,
+	#superclass : #ToAdditionalSelecter,
+	#category : #'Toplo-Widget-List-Selection-Selecter'
+}
+
+{ #category : #initialization }
+ToHiddenSelecter >> initialize [ 
+
+	super initialize.
+	self eventClass: ToListHiddenSelectionChangedEvent.
+	self uniqueId: #hidden
+	
+]
diff --git a/src/Toplo-Widget-List/ToInfiniteElement.class.st b/src/Toplo-Widget-List/ToInfiniteElement.class.st
index 65c0604b..9f083460 100644
--- a/src/Toplo-Widget-List/ToInfiniteElement.class.st
+++ b/src/Toplo-Widget-List/ToInfiniteElement.class.st
@@ -70,12 +70,6 @@ ToInfiniteElement >> initialize [
 	self matchParent
 ]
 
-{ #category : #layout }
-ToInfiniteElement >> layoutCritical: aBlock [
-			
-	aBlock value
-]
-
 { #category : #accessing }
 ToInfiniteElement >> listElement [
 
diff --git a/src/Toplo-Widget-List/ToListAbstractSelectionMode.class.st b/src/Toplo-Widget-List/ToListAbstractSelectionMode.class.st
deleted file mode 100644
index cff05745..00000000
--- a/src/Toplo-Widget-List/ToListAbstractSelectionMode.class.st
+++ /dev/null
@@ -1,142 +0,0 @@
-Class {
-	#name : #ToListAbstractSelectionMode,
-	#superclass : #Object,
-	#instVars : [
-		'selectionModel',
-		'selecter',
-		'requestFocusOnMouseDown',
-		'selectOnMouseDown'
-	],
-	#category : #'Toplo-Widget-List-Selection-Mode'
-}
-
-{ #category : #testing }
-ToListAbstractSelectionMode >> allowRequestFocusOnMouseDown [
-
-	^ self requestFocusOnMouseDown 
-]
-
-{ #category : #initialization }
-ToListAbstractSelectionMode >> initialize [ 
-
-	super initialize.
-	requestFocusOnMouseDown := true.
-	selectOnMouseDown := false
-
-]
-
-{ #category : #testing }
-ToListAbstractSelectionMode >> isMultipleSelection [
-
-	^ self subclassResponsibility 
-]
-
-{ #category : #accessing }
-ToListAbstractSelectionMode >> itemCount [
-
-	^ self selectionModel itemCount
-]
-
-{ #category : #'instance creation' }
-ToListAbstractSelectionMode >> newSelecterIn: anElement [
-
-	self subclassResponsibility 
-]
-
-{ #category : #accessing }
-ToListAbstractSelectionMode >> nodeEventHandlerClasses [ 
-
-	^ self subclassResponsibility 
-
-]
-
-{ #category : #accessing }
-ToListAbstractSelectionMode >> onAddedNode: aNode [
-
-	self nodeEventHandlerClasses do: [ :cls | aNode addEventHandler: cls new ]
-]
-
-{ #category : #'event handling' }
-ToListAbstractSelectionMode >> onClickEvent: anEvent onNode: aNode [
-
-	self subclassResponsibility 
-]
-
-{ #category : #'api - hooks' }
-ToListAbstractSelectionMode >> onInstalledIn: anElement [
-
-	self selectionModel: anElement selectionModel.
-	selecter := self newSelecterIn: anElement.
-	selecter onInstalledIn: anElement
-]
-
-{ #category : #accessing }
-ToListAbstractSelectionMode >> onRemovedNode: aNode [
-
-	(aNode eventDispatcher handlers select: [ :handler |
-		 self nodeEventHandlerClasses anySatisfy: [ :cls |
-			 cls == handler class ] ]) do: [ :handler |
-		aNode removeEventHandler: handler ]
-]
-
-{ #category : #'api - hooks' }
-ToListAbstractSelectionMode >> onUninstalledIn: anElement [
-
-	selecter onUninstalledIn: anElement.
-	selecter := nil.
-	self selectionModel: nil
-]
-
-{ #category : #accessing }
-ToListAbstractSelectionMode >> requestFocusOnMouseDown [
-
-	^ requestFocusOnMouseDown
-]
-
-{ #category : #accessing }
-ToListAbstractSelectionMode >> requestFocusOnMouseDown: aBoolean [
-
-	requestFocusOnMouseDown := aBoolean 
-]
-
-{ #category : #accessing }
-ToListAbstractSelectionMode >> selectOnMouseDown [
-
-	^ selectOnMouseDown
-]
-
-{ #category : #accessing }
-ToListAbstractSelectionMode >> selectOnMouseDown: aBoolean [
-
-	selectOnMouseDown := aBoolean
-]
-
-{ #category : #accessing }
-ToListAbstractSelectionMode >> selectedIndexes [
-
-	^ self selectionModel indexes
-]
-
-{ #category : #accessing }
-ToListAbstractSelectionMode >> selectedIndexesCount [
-
-	^ self selectionModel selectedIndexesCount
-]
-
-{ #category : #accessing }
-ToListAbstractSelectionMode >> selecter [
-
-	^ selecter 
-]
-
-{ #category : #accessing }
-ToListAbstractSelectionMode >> selectionModel [
-
-	^ selectionModel
-]
-
-{ #category : #accessing }
-ToListAbstractSelectionMode >> selectionModel: aSelectionModel [
-
-	selectionModel := aSelectionModel
-]
diff --git a/src/Toplo-Widget-List/ToListElement.class.st b/src/Toplo-Widget-List/ToListElement.class.st
index aa4a6f9e..be08d6d8 100644
--- a/src/Toplo-Widget-List/ToListElement.class.st
+++ b/src/Toplo-Widget-List/ToListElement.class.st
@@ -2,15 +2,34 @@ Class {
 	#name : #ToListElement,
 	#superclass : #ToBasicListElement,
 	#instVars : [
-		'disabledSelecter',
-		'unselectableSelecter',
-		'secondarySelectionModel',
 		'secondarySelectionMode',
-		'hiddenSelecter'
+		'additionalSelecterIndex'
 	],
 	#category : #'Toplo-Widget-List-Core'
 }
 
+{ #category : #private }
+ToListElement >> additionalSelecterIndex [
+
+	^ additionalSelecterIndex
+]
+
+{ #category : #'additional selecters' }
+ToListElement >> additionalSelecterWithId: anUniqueId [
+
+	^ additionalSelecterIndex at: anUniqueId ifAbsent: [  ]
+]
+
+{ #category : #'additional selecters' }
+ToListElement >> changeAdditionalSelecterWithId: aUniqueId with: aSelecter [
+
+	self unrecordAdditionalSelecter:
+		(self additionalSelecterWithId: aUniqueId).
+	aSelecter ifNil: [ ^ self ].
+	aSelecter uniqueId: aUniqueId.
+	self recordAdditionalSelecter: aSelecter
+]
+
 { #category : #accessing }
 ToListElement >> data [
 
@@ -43,33 +62,25 @@ ToListElement >> defaultSecondarySelectionEventHandler [
 { #category : #initialization }
 ToListElement >> defaultSecondarySelectionMode [
 
-	^ ToListMultipleSelectionMode new operator:
-		  (ToSecondarySelectionModelOperator new selectionModel:
-			   self secondarySelectionModel)
+	^ (ToListSelectionMode secondaryOn: self) beMultipleSelection
 ]
 
 { #category : #accessing }
 ToListElement >> disabledSelecter [ 
 
-	^ disabledSelecter
+	^ self additionalSelecterWithId: #disabled
 ]
 
 { #category : #accessing }
 ToListElement >> disabledSelectionModel [
 
-	^ self disabledSelecter selectionModel
+	^ self selectionModel disabledSelectionModel
 ]
 
 { #category : #accessing }
 ToListElement >> hiddenSelecter [ 
 
-	^ hiddenSelecter
-]
-
-{ #category : #accessing }
-ToListElement >> hiddenSelectionModel [
-
-	^ self hiddenSelecter selectionModel
+	^ self additionalSelecterWithId: #hidden
 ]
 
 { #category : #initialization }
@@ -79,43 +90,18 @@ ToListElement >> infiniteSharedEvents [
 ]
 
 { #category : #initialization }
-ToListElement >> initializeSelectionModel [
-
-	unselectableSelecter := self installSelecterForEventClass:
-		                        ToListUnselectableSelectionChangedEvent.
-	disabledSelecter := self installSelecterForEventClass:
-		                    ToListDisabledSelectionChangedEvent.
-	hiddenSelecter := self installSelecterForEventClass:
-		                  ToListHiddenSelectionChangedEvent.
+ToListElement >> initialize [
 
-	self secondarySelectionModel: self newSecondarySelectionModel.
+	super initialize.
 	self secondarySelectionMode: self defaultSecondarySelectionMode.
 	self addEventHandler: self defaultSecondarySelectionEventHandler.
-
-	super initializeSelectionModel
-]
-
-{ #category : #initialization }
-ToListElement >> installSelecterForEventClass: anEventClass [
-
-	| newSelectionModel newSelecter operator |
-	operator := ToAdditionalSelectionModelOperator eventClass:
-		            anEventClass.
-	newSelectionModel := self newSelectionModel.
-	newSelectionModel onInstalledIn: self.
-	newSelecter := ToMultiSelectionModelSelecter new.
-	operator selectionModel: newSelectionModel.
-	operator onInstalledIn: self.
-	newSelecter operator: operator.
-	newSelecter onInstalledIn: self.
-
-	^ newSelecter
+	additionalSelecterIndex := SmallIdentityDictionary new
 ]
 
 { #category : #'instance creation' }
 ToListElement >> newPrimarySelectionModel [
 
-	^ ToListPrimarySelectionModel new
+	^ ToListElementSelectionModel new
 ]
 
 { #category : #skin }
@@ -130,12 +116,34 @@ ToListElement >> newSecondarySelectionModel [
 	^ ToListElementSelectionModel new
 ]
 
+{ #category : #'additional selecters' }
+ToListElement >> recordAdditionalSelecter: aSelecter [
+
+	aSelecter ifNil: [ ^ self ].
+	additionalSelecterIndex
+		at: aSelecter uniqueId
+		ifPresent: [
+		Error signal: 'A selecter with the same id already exists' ].
+	additionalSelecterIndex
+		at: aSelecter uniqueId
+		put: aSelecter
+]
+
 { #category : #accessing }
 ToListElement >> secondarySelecter [ 
 
 	^ self secondarySelectionMode selecter
 ]
 
+{ #category : #accessing }
+ToListElement >> secondarySelectionElements [
+
+	^ Array streamContents: [ :stream |
+		  self childrenDo: [ :child |
+			  (child isKindOf: ToListSecondarySelectionElement) ifTrue: [
+				  stream nextPut: child ] ] ]
+]
+
 { #category : #accessing }
 ToListElement >> secondarySelectionMode [
 
@@ -154,25 +162,84 @@ ToListElement >> secondarySelectionMode: aSelectionMode [
 { #category : #accessing }
 ToListElement >> secondarySelectionModel [
 
-	^ secondarySelectionModel
+	^ self secondarySelectionMode selectionModel
 ]
 
-{ #category : #accessing }
-ToListElement >> secondarySelectionModel: aSelectionModel [
+{ #category : #'additional selecters' }
+ToListElement >> unrecordAdditionalSelecter: aSelecter [
 
-	secondarySelectionModel ifNotNil: [ secondarySelectionModel onUninstalledIn: self ].
-	secondarySelectionModel := aSelectionModel.
-	secondarySelectionModel ifNotNil: [secondarySelectionModel onInstalledIn: self ]
+	aSelecter ifNil: [ ^ self ].
+	additionalSelecterIndex removeKey:	aSelecter uniqueId
 ]
 
 { #category : #accessing }
 ToListElement >> unselectableSelecter [
 
-	^ unselectableSelecter
+	^ self additionalSelecterWithId: #unselectable
 ]
 
-{ #category : #accessing }
-ToListElement >> unselectableSelectionModel [
+{ #category : #'additional selecters' }
+ToListElement >> withAdditionalSelecterWithId: aSymbol withEventClass: anEventClass [
+
+	| selecter |
+	selecter := ToAdditionalSelecter new.
+	selecter uniqueId: aSymbol.
+	selecter eventClass: anEventClass.
+	selecter onInstalledIn: self.
+	^ selecter
+	
+
+]
+
+{ #category : #'additional selecters' }
+ToListElement >> withDisabledSelecter [
+
+	ToDisabledSelecter on: self
+	
+
+]
+
+{ #category : #'additional selecters' }
+ToListElement >> withHiddenSelecter [
+
+	ToHiddenSelecter on: self
+
+]
+
+{ #category : #'additional selecters' }
+ToListElement >> withUnselectableSelecter [
+
+	ToUnselectableSelecter on: self
+
+]
+
+{ #category : #'additional selecters' }
+ToListElement >> withoutAdditionalSelecterWithId: aSymbol [ 
+
+	| selecter |
+	selecter := self additionalSelecterWithId: aSymbol.
+	selecter ifNil: [ ^ self ].
+	selecter onUninstalledIn: self.
+	^ selecter
+]
+
+{ #category : #'additional selecters' }
+ToListElement >> withoutDisabledSelecter [
+
+	(self additionalSelecterWithId: #disabled) ifNotNil: [ :selecter |
+		selecter onUninstalledIn: self ]
+]
+
+{ #category : #'additional selecters' }
+ToListElement >> withoutHiddenSelecter [
+
+	(self additionalSelecterWithId: #hidden) ifNotNil: [ :selecter |
+		selecter onUninstalledIn: self ]
+]
+
+{ #category : #'additional selecters' }
+ToListElement >> withoutUnselectableSelecter [
 
-	^ self unselectableSelecter selectionModel
+	(self additionalSelecterWithId: #unselectable) ifNotNil: [ :selecter |
+		selecter onUninstalledIn: self ]
 ]
diff --git a/src/Toplo-Widget-List/ToListElementCommand.class.st b/src/Toplo-Widget-List/ToListElementCommand.class.st
index cb89ec1e..0c11b401 100644
--- a/src/Toplo-Widget-List/ToListElementCommand.class.st
+++ b/src/Toplo-Widget-List/ToListElementCommand.class.st
@@ -3,6 +3,7 @@ Class {
 	#superclass : #ToElementBasicCommand,
 	#instVars : [
 		'operator',
+		'selectionModel',
 		'selectionChanged'
 	],
 	#category : #'Toplo-Widget-List-Command-Selection'
@@ -12,7 +13,7 @@ Class {
 ToListElementCommand >> applyIn: aTarget [
 	" dispatch that should send back #applyOn:in: to myself"
 
-	aTarget layoutCritical: [ self operator applyCommand: self in: aTarget ]
+	self operator applyCommand: self in: aTarget
 ]
 
 { #category : #hook }
@@ -43,3 +44,15 @@ ToListElementCommand >> selectionChanged: aBoolean [
 
 	selectionChanged := aBoolean
 ]
+
+{ #category : #accessing }
+ToListElementCommand >> selectionModel [
+
+	^ selectionModel
+]
+
+{ #category : #accessing }
+ToListElementCommand >> selectionModel: aSelectionModel [
+
+	selectionModel := aSelectionModel
+]
diff --git a/src/Toplo-Widget-List/ToListElementEventHandler.class.st b/src/Toplo-Widget-List/ToListElementEventHandler.class.st
index d2f6615b..3929c870 100644
--- a/src/Toplo-Widget-List/ToListElementEventHandler.class.st
+++ b/src/Toplo-Widget-List/ToListElementEventHandler.class.st
@@ -56,19 +56,23 @@ ToListElementEventHandler >> listHiddenSelectionChangedEvent: anEvent [
 { #category : #'list element handling' }
 ToListElementEventHandler >> listUnselectableSelectionChangedEvent: anEvent [
 
-	| listElement firstPos lastPos |
+	| listElement |
 	listElement := anEvent currentTarget.
 	listElement isAttachedToSceneGraph ifFalse: [ ^ self ].
 	listElement infinite hasChildren ifFalse: [ ^ self ].
 	anEvent selectionModel ifEmpty: [
 		listElement dataSource notifyChanged.
 		^ self ].
-	firstPos := listElement infinite firstChild holder position.
-	lastPos := listElement infinite lastChild holder position.
-	firstPos to: lastPos do: [ :idx |
-		((listElement selectionModel containsIndex: idx) and: [
-			 listElement unselectableSelectionModel containsIndex: idx ]) ifTrue: [
-			listElement selecter deselectIndex: idx ] ].
+
+	listElement selectionModel unselectableSelectionModelDo: [ :sm |
+		| firstPos lastPos |
+		firstPos := listElement infinite firstChild holder position.
+		lastPos := listElement infinite lastChild holder position.
+		firstPos to: lastPos do: [ :idx |
+			((listElement selectionModel containsIndex: idx) and: [
+				 sm containsIndex: idx ]) ifTrue: [
+				listElement selecter deselectIndex: idx ] ] ].
+
 	anEvent selectionModel selectedIndexesIntervalsDo: [ :interval |
 		listElement dataSource notifyItemsChanged:
 			(interval first to: interval last) ]
diff --git a/src/Toplo-Widget-List/ToListElementSelectionModel.class.st b/src/Toplo-Widget-List/ToListElementSelectionModel.class.st
index 9ddcd2ad..061b25a6 100644
--- a/src/Toplo-Widget-List/ToListElementSelectionModel.class.st
+++ b/src/Toplo-Widget-List/ToListElementSelectionModel.class.st
@@ -7,47 +7,123 @@ Class {
 	#category : #'Toplo-Widget-List-Selection-Model'
 }
 
+{ #category : #accessing }
+ToListElementSelectionModel >> additionalSelecterWithId: anUniqueId [
+
+	^ listElement additionalSelecterWithId: anUniqueId
+]
+
+{ #category : #accessing }
+ToListElementSelectionModel >> additionalSelecters [
+
+	^ listElement additionalSelecterIndex values
+]
+
 { #category : #copying }
 ToListElementSelectionModel >> copySelectionFrom: anotherSelectionModel [
 
 	super copySelectionFrom: anotherSelectionModel.
-	self unselectableSelectionModel copySelectionFrom:
-		anotherSelectionModel unselectableSelectionModel.
-	self disabledSelectionModel copySelectionFrom:
-		anotherSelectionModel disabledSelectionModel.
-	self hiddenSelectionModel copySelectionFrom:
-		anotherSelectionModel hiddenSelectionModel
+	self additionalSelecters do: [ :dst |
+		(anotherSelectionModel additionalSelecterWithId: dst uniqueId)
+			ifNotNil: [ :src |
+			dst selectionModel copySelectionFrom: src selectionModel ] ]
+]
+
+{ #category : #updating }
+ToListElementSelectionModel >> disableIndex: anIndex [
+
+	self disabledSelectionModelDo: [ :sm | sm selectIndex: anIndex ]
 ]
 
 { #category : #accessing }
 ToListElementSelectionModel >> disabledSelectionModel [
 
-	^ listElement disabledSelectionModel
+	^ listElement disabledSelecter ifNotNil: [ :selecter |
+		  selecter selectionModel ]
+]
+
+{ #category : #accessing }
+ToListElementSelectionModel >> disabledSelectionModelDo: aBlock [
+
+	self disabledSelectionModel ifNil: [ ^ self ].
+	aBlock value: self disabledSelectionModel
+]
+
+{ #category : #updating }
+ToListElementSelectionModel >> enableAll [
+
+	self disabledSelectionModelDo: [ :sm | sm deselectAll ]
+]
+
+{ #category : #updating }
+ToListElementSelectionModel >> enableIndex: anIndex [
+
+	self disabledSelectionModelDo: [ :sm | sm deselectIndex: anIndex ]
 ]
 
 { #category : #testing }
 ToListElementSelectionModel >> hasUnselectableInInterval: anInterval [
 
-	^ anInterval anySatisfy: [ :idx | self unselectableSelectionModel containsIndex: idx ]
-
+	self unselectableSelectionModelDo: [ :sm |
+		^ anInterval anySatisfy: [ :idx | sm containsIndex: idx ] ].
+	^ super hasUnselectableInInterval: anInterval
 ]
 
 { #category : #accessing }
 ToListElementSelectionModel >> hiddenSelectionModel [
 
-	^ listElement hiddenSelectionModel
+	^ listElement hiddenSelecter ifNotNil: [ :selecter |
+		  selecter selectionModel ]
+]
+
+{ #category : #accessing }
+ToListElementSelectionModel >> hiddenSelectionModelDo: aBlock [
+
+	self hiddenSelectionModel ifNil: [ ^ self ].
+	aBlock value: self hiddenSelectionModel
+]
+
+{ #category : #updating }
+ToListElementSelectionModel >> hideIndex: anIndex [
+
+	self hiddenSelectionModelDo: [ :sm | sm selectIndex: anIndex ]
+]
+
+{ #category : #updating }
+ToListElementSelectionModel >> hideOnlyIndexes: aCollection [
+
+	self hiddenSelectionModelDo: [ :sm | sm selectOnlyIndexes: aCollection ]
+]
+
+{ #category : #testing }
+ToListElementSelectionModel >> isDisabledIndex: anIndex [
+
+	self disabledSelectionModelDo: [ :sm | ^ sm containsIndex: anIndex ].
+	^ super isDisabledIndex: anIndex
+]
+
+{ #category : #testing }
+ToListElementSelectionModel >> isHiddenIndex: anIndex [
+
+	self hiddenSelectionModelDo: [ :sm | ^ sm containsIndex: anIndex ].
+	^ super isHiddenIndex: anIndex
 ]
 
 { #category : #testing }
 ToListElementSelectionModel >> isUnselectableIndex: anIndex [
 
-	^ (self unselectableSelectionModel containsIndex: anIndex) or: [
-		  self hiddenSelectionModel containsIndex: anIndex ]
+	self unselectableSelectionModelDo: [ :sm |
+		^ (sm containsIndex: anIndex) or: [ self isHiddenIndex: anIndex ] ].
+	^ super isUnselectableIndex: anIndex
 ]
 
 { #category : #accessing }
 ToListElementSelectionModel >> nextSelectableIndexStartingAt: anIndex [
 
+	(self unselectableSelectionModel isNil or: [
+		 self hiddenSelectionModel isNil ]) ifTrue: [
+		^ super nextSelectableIndexStartingAt: anIndex ].
+	
 	(self unselectableSelectionModel isEmpty and: [
 		 self hiddenSelectionModel isEmpty ]) ifTrue: [
 		^ super nextSelectableIndexStartingAt: anIndex ].
@@ -62,20 +138,23 @@ ToListElementSelectionModel >> nextSelectableIndexStartingAt: anIndex [
 ToListElementSelectionModel >> onInstalledIn: aListElement [
 
 	super onInstalledIn: aListElement.
-	listElement := aListElement
+	listElement := aListElement.
 ]
 
 { #category : #'api - hooks' }
-ToListElementSelectionModel >> onUninstalledIn: aListElement [ 
+ToListElementSelectionModel >> onUninstalledIn: aListElement [
 
-	listElement := nil.
 	super onUninstalledIn: aListElement.
-
+	listElement := nil
 ]
 
 { #category : #accessing }
 ToListElementSelectionModel >> previousSelectableIndexStartingAt: anIndex [
 
+	(self unselectableSelectionModel isNil or: [
+		 self hiddenSelectionModel isNil ]) ifTrue: [
+		^ super previousSelectableIndexStartingAt: anIndex ].
+
 	(self unselectableSelectionModel isEmpty and: [
 		 self hiddenSelectionModel isEmpty ]) ifTrue: [
 		^ super previousSelectableIndexStartingAt: anIndex ].
@@ -89,17 +168,30 @@ ToListElementSelectionModel >> previousSelectableIndexStartingAt: anIndex [
 { #category : #updating }
 ToListElementSelectionModel >> selectIndex: anIndex [
 
-	(self unselectableSelectionModel containsIndex: anIndex) ifTrue: [ ^ self ].
+	self unselectableSelectionModelDo: [ :sm | (sm containsIndex: anIndex) ifTrue: [ ^ self ] ].
 	super selectIndex: anIndex
 ]
 
 { #category : #updating }
 ToListElementSelectionModel >> selectIndex: aFirstIndex to: aSecondIndex [
 
+	self flag: 'To be optimized'.
 	super selectIndex: aFirstIndex to: aSecondIndex.
-	aFirstIndex to: aSecondIndex do: [ :idx |
-		(self unselectableSelectionModel containsIndex: idx) ifTrue: [
-			self deselectIndex: idx ] ]
+	self unselectableSelectionModelDo: [ :sm |
+		aFirstIndex to: aSecondIndex do: [ :idx |
+		(sm containsIndex: idx) ifTrue: [ self deselectIndex: idx ] ] ]
+]
+
+{ #category : #updating }
+ToListElementSelectionModel >> selectableAll [
+
+	self unselectableSelectionModelDo: [ :sm | sm deselectAll ]
+]
+
+{ #category : #updating }
+ToListElementSelectionModel >> selectableIndex: anIndex [
+
+	self unselectableSelectionModelDo: [ :sm | sm deselectIndex: anIndex ]
 ]
 
 { #category : #updating }
@@ -108,34 +200,76 @@ ToListElementSelectionModel >> shift: aGap from: aStartIndex for: anEventTarget
 	(aGap < 0 and: [ self itemCount >= aStartIndex ]) ifTrue: [
 		| count |
 		count := aGap abs.
-		"self disabledSelectionModel
-			deselectIndex: aStartIndex
-			to: aStartIndex + count - 1."
 		self deselectIndex: aStartIndex to: aStartIndex + count - 1 ].
-	self unselectableSelectionModel shift: aGap from: aStartIndex.
-	self disabledSelectionModel shift: aGap from: aStartIndex.
+	self additionalSelecters  do: [ :selecter |
+		selecter selectionModel shift: aGap from: aStartIndex ].
 
 	" ** super send after **"
 	super shift: aGap from: aStartIndex for: anEventTarget
 ]
 
 { #category : #updating }
-ToListElementSelectionModel >> transferIndex: anIndex from: anotherPrimarySelectionModel as: targetIndex [
+ToListElementSelectionModel >> transferIndex: anIndex from: anotherSelectionModel as: targetIndex [
+
+	super
+		transferIndex: anIndex
+		from: anotherSelectionModel
+		as: targetIndex.
+	self additionalSelecters do: [ :dst |
+		(anotherSelectionModel additionalSelecterWithId: dst uniqueId)
+			ifNotNil: [ :other |
+				(other selectionModel containsIndex: anIndex)
+					ifTrue: [ dst selectionModel selectIndex: targetIndex ]
+					ifFalse: [ dst selectionModel deselectIndex: targetIndex ] ] ]
+]
 
-	super transferIndex: anIndex from: anotherPrimarySelectionModel as: targetIndex.
-	(anotherPrimarySelectionModel disabledSelectionModel containsIndex: anIndex)
-		ifTrue: [ self disabledSelectionModel selectIndex: targetIndex ]
-		ifFalse: [ self disabledSelectionModel deselectIndex: targetIndex ].
-	(anotherPrimarySelectionModel unselectableSelectionModel containsIndex: anIndex)
-		ifTrue: [ self unselectableSelectionModel selectIndex: targetIndex ]
-		ifFalse: [ self unselectableSelectionModel deselectIndex: targetIndex ].
-	(anotherPrimarySelectionModel hiddenSelectionModel containsIndex: anIndex)
-		ifTrue: [ self hiddenSelectionModel selectIndex: targetIndex ]
-		ifFalse: [ self hiddenSelectionModel deselectIndex: targetIndex ]
+{ #category : #updating }
+ToListElementSelectionModel >> transferSelectionFromIndex: anIndex toIndex: targetIndex in: anotherSelectionModel [ 
+
+	super
+		transferSelectionFromIndex: anIndex toIndex: targetIndex in: anotherSelectionModel.
+	self additionalSelecters do: [ :dst |
+		(anotherSelectionModel additionalSelecterWithId: dst uniqueId)
+			ifNotNil: [ :other |
+				(dst selectionModel containsIndex: anIndex)
+					ifTrue: [ other selectionModel selectIndex: targetIndex ]
+					ifFalse: [ other selectionModel deselectIndex: targetIndex ] ] ]
+]
+
+{ #category : #updating }
+ToListElementSelectionModel >> unhideAll [
+
+	self hiddenSelectionModelDo: [ :sm | sm deselectAll ]
+]
+
+{ #category : #updating }
+ToListElementSelectionModel >> unhideIndex: anIndex [
+
+	self hiddenSelectionModelDo: [ :sm | sm deselectIndex: anIndex ]
+]
+
+{ #category : #updating }
+ToListElementSelectionModel >> unhideIndexes: aCollection [
+
+	self hiddenSelectionModelDo: [ :sm | sm deselectIndexes: aCollection ]
+]
+
+{ #category : #updating }
+ToListElementSelectionModel >> unselectableIndex: anIndex [
+
+	self unselectableSelectionModelDo: [ :sm | sm selectIndex: anIndex ]
 ]
 
 { #category : #accessing }
 ToListElementSelectionModel >> unselectableSelectionModel [
 
-	^ listElement unselectableSelectionModel
+	^ listElement unselectableSelecter ifNotNil: [ :selecter |
+		  selecter selectionModel ]
+]
+
+{ #category : #accessing }
+ToListElementSelectionModel >> unselectableSelectionModelDo: aBlock [
+
+	self unselectableSelectionModel ifNil: [ ^ self ].
+	aBlock value: self unselectableSelectionModel
 ]
diff --git a/src/Toplo-Widget-List/ToListMultipleSelectionMode.class.st b/src/Toplo-Widget-List/ToListMultipleSelectionMode.class.st
deleted file mode 100644
index 3384bf4a..00000000
--- a/src/Toplo-Widget-List/ToListMultipleSelectionMode.class.st
+++ /dev/null
@@ -1,58 +0,0 @@
-Class {
-	#name : #ToListMultipleSelectionMode,
-	#superclass : #ToListSelectionMode,
-	#category : #'Toplo-Widget-List-Selection-Mode'
-}
-
-{ #category : #testing }
-ToListMultipleSelectionMode >> allowRequestFocusOnMouseDown [
-
-	( self selectedIndexesCount > 1 )
-		ifTrue: [ self preserveSelectionOnFocused ifTrue: [ ^ false ] ].
-	^ super allowRequestFocusOnMouseDown
-]
-
-{ #category : #testing }
-ToListMultipleSelectionMode >> isMultipleSelection [
-
-	^ true
-]
-
-{ #category : #'instance creation' }
-ToListMultipleSelectionMode >> newSelecterIn: anElement [
-
-	^ ToMultiSelectionModelSelecter new 
-]
-
-{ #category : #accessing }
-ToListMultipleSelectionMode >> nodeEventHandlerClasses [ 
-
-	^ { ToListNodeMultiSelectionClickEventHandler }
-]
-
-{ #category : #'event handling' }
-ToListMultipleSelectionMode >> onClickEvent: anEvent onNode: aNode [
-
-	super onClickEvent: anEvent onNode: aNode.
-	anEvent sourceEvent modifiers isShift ifTrue: [
-		| curr |
-		curr := self selecter currentIndex.
-		self selecter selectIndex: curr to: aNode holder position.
-		^ self ].
-	(anEvent sourceEvent modifiers isPrimaryModifier or: [ self selectOnMouseDown ])
-		ifTrue: [
-			self selectOrDeselectOnNode: aNode.
-			^ self ].
-	self selecter selectOnlyIndex: aNode holder position
-]
-
-{ #category : #'event handling' }
-ToListMultipleSelectionMode >> selectOrDeselectOnNode: aNode [
-
-	| index target |
-	index := aNode holder position.
-	target := aNode holder listElement.
-	(target selectionModel containsIndex: index)
-		ifTrue: [ self selecter deselectIndex: index ]
-		ifFalse: [ self selecter selectIndex: index ]
-]
diff --git a/src/Toplo-Widget-List/ToListNoneSelectionMode.class.st b/src/Toplo-Widget-List/ToListNoneSelectionMode.class.st
deleted file mode 100644
index 3188a0de..00000000
--- a/src/Toplo-Widget-List/ToListNoneSelectionMode.class.st
+++ /dev/null
@@ -1,30 +0,0 @@
-Class {
-	#name : #ToListNoneSelectionMode,
-	#superclass : #ToListAbstractSelectionMode,
-	#category : #'Toplo-Widget-List-Selection-Mode'
-}
-
-{ #category : #testing }
-ToListNoneSelectionMode >> isMultipleSelection [
-
-	^ false
-]
-
-{ #category : #'instance creation' }
-ToListNoneSelectionMode >> newSelecterIn: anElement [
-
-	^ ToNoneSelectionModelSelecter new 
-]
-
-{ #category : #accessing }
-ToListNoneSelectionMode >> nodeEventHandlerClasses [ 
-
-	^ {  }
-
-]
-
-{ #category : #'event handling' }
-ToListNoneSelectionMode >> onClickEvent: anEvent onNode: aNode [
-
-
-]
diff --git a/src/Toplo-Widget-List/ToListPrimarySelectionElementEventHandler.class.st b/src/Toplo-Widget-List/ToListPrimarySelectionElementEventHandler.class.st
index 485a025a..3ec508cc 100644
--- a/src/Toplo-Widget-List/ToListPrimarySelectionElementEventHandler.class.st
+++ b/src/Toplo-Widget-List/ToListPrimarySelectionElementEventHandler.class.st
@@ -16,13 +16,6 @@ ToListPrimarySelectionElementEventHandler >> blurEvent: anEvent [
 	self enqueueUpdateSelectionFromEvent: anEvent
 ]
 
-{ #category : #'selection managing' }
-ToListPrimarySelectionElementEventHandler >> criticalUpdateSelectionFromEvent: anEvent [
-
-	anEvent currentTarget layoutCritical: [
-		self updateSelectionFromEvent: anEvent ]
-]
-
 { #category : #'element handlers' }
 ToListPrimarySelectionElementEventHandler >> elementExtentChangedEvent: anEvent [
 
@@ -32,7 +25,7 @@ ToListPrimarySelectionElementEventHandler >> elementExtentChangedEvent: anEvent
 { #category : #'element handlers' }
 ToListPrimarySelectionElementEventHandler >> elementScrolledEvent: anEvent [
 
-	self criticalUpdateSelectionFromEvent: anEvent
+	self updateSelectionFromEvent: anEvent
 ]
 
 { #category : #'selection managing' }
@@ -57,19 +50,19 @@ ToListPrimarySelectionElementEventHandler >> eventsToHandle [
 { #category : #'element handlers' }
 ToListPrimarySelectionElementEventHandler >> focusEvent: anEvent [
 
-	self criticalUpdateSelectionFromEvent: anEvent
+	self updateSelectionFromEvent: anEvent
 ]
 
 { #category : #'element handlers' }
 ToListPrimarySelectionElementEventHandler >> listPrimarySelectionChangedEvent: anEvent [
 
-	self criticalUpdateSelectionFromEvent: anEvent
+	self updateSelectionFromEvent: anEvent
 ]
 
 { #category : #'element handlers' }
 ToListPrimarySelectionElementEventHandler >> listPrimarySelectionDirtyEvent: anEvent [
 
-	self criticalUpdateSelectionFromEvent: anEvent
+	self updateSelectionFromEvent: anEvent
 ]
 
 { #category : #'selection managing' }
diff --git a/src/Toplo-Widget-List/ToListPrimarySelectionModel.class.st b/src/Toplo-Widget-List/ToListPrimarySelectionModel.class.st
deleted file mode 100644
index a5be0e8a..00000000
--- a/src/Toplo-Widget-List/ToListPrimarySelectionModel.class.st
+++ /dev/null
@@ -1,71 +0,0 @@
-Class {
-	#name : #ToListPrimarySelectionModel,
-	#superclass : #ToListElementSelectionModel,
-	#category : #'Toplo-Widget-List-Selection-Model'
-}
-
-{ #category : #updating }
-ToListPrimarySelectionModel >> disableIndex: anIndex [
-
-	self disabledSelectionModel selectIndex: anIndex
-]
-
-{ #category : #updating }
-ToListPrimarySelectionModel >> enableAll [
-
-	self disabledSelectionModel deselectAll
-]
-
-{ #category : #updating }
-ToListPrimarySelectionModel >> enableIndex: anIndex [
-
-	self disabledSelectionModel deselectIndex: anIndex
-]
-
-{ #category : #updating }
-ToListPrimarySelectionModel >> hideIndex: anIndex [
-
-	self hiddenSelectionModel selectIndex: anIndex
-]
-
-{ #category : #updating }
-ToListPrimarySelectionModel >> hideOnlyIndexes: aCollection [
-
-	self hiddenSelectionModel selectOnlyIndexes: aCollection
-]
-
-{ #category : #updating }
-ToListPrimarySelectionModel >> selectableAll [
-
-	self unselectableSelectionModel deselectAll
-]
-
-{ #category : #updating }
-ToListPrimarySelectionModel >> selectableIndex: anIndex [
-
-	self unselectableSelectionModel deselectIndex: anIndex
-]
-
-{ #category : #updating }
-ToListPrimarySelectionModel >> unhideAll [
-
-	self hiddenSelectionModel deselectAll
-]
-
-{ #category : #updating }
-ToListPrimarySelectionModel >> unhideIndex: anIndex [
-
-	self hiddenSelectionModel deselectIndex: anIndex
-]
-
-{ #category : #updating }
-ToListPrimarySelectionModel >> unhideIndexes: aCollection [
-
-	self hiddenSelectionModel deselectIndexes: aCollection
-]
-
-{ #category : #updating }
-ToListPrimarySelectionModel >> unselectableIndex: anIndex [
-
-	self unselectableSelectionModel selectIndex: anIndex
-]
diff --git a/src/Toplo-Widget-List/ToListSecondarySelectionElementEventHandler.class.st b/src/Toplo-Widget-List/ToListSecondarySelectionElementEventHandler.class.st
index ce8b2d3f..3bb1974c 100644
--- a/src/Toplo-Widget-List/ToListSecondarySelectionElementEventHandler.class.st
+++ b/src/Toplo-Widget-List/ToListSecondarySelectionElementEventHandler.class.st
@@ -19,14 +19,13 @@ ToListSecondarySelectionElementEventHandler >> addSecondarySelectionIn: aListEle
 { #category : #'selection managing' }
 ToListSecondarySelectionElementEventHandler >> criticalUpdateSelectionFromEvent: anEvent [
 
-	anEvent currentTarget layoutCritical: [
-		self updateSelectionFromEvent: anEvent ]
+	self updateSelectionFromEvent: anEvent
 ]
 
 { #category : #'element handlers' }
 ToListSecondarySelectionElementEventHandler >> elementExtentChangedEvent: anEvent [
 
-	self criticalUpdateSelectionFromEvent: anEvent
+	self updateSelectionFromEvent: anEvent
 ]
 
 { #category : #'mouse handlers' }
@@ -34,7 +33,7 @@ ToListSecondarySelectionElementEventHandler >> elementScrolledEvent: anEvent [
 
 	anEvent currentTarget spaceDo: [ :sp | 
 		sp mouseProcessor handleLastMouseMove ].
-	self criticalUpdateSelectionFromEvent: anEvent
+	self updateSelectionFromEvent: anEvent
 ]
 
 { #category : #'api - accessing' }
@@ -51,13 +50,13 @@ ToListSecondarySelectionElementEventHandler >> eventsToHandle [
 { #category : #'mouse handlers' }
 ToListSecondarySelectionElementEventHandler >> infiniteScrollFinishedEvent: anEvent [
 
-	self criticalUpdateSelectionFromEvent: anEvent
+	self updateSelectionFromEvent: anEvent
 ]
 
 { #category : #'mouse handlers' }
 ToListSecondarySelectionElementEventHandler >> listSecondarySelectionChangedEvent: anEvent [
 
-	self criticalUpdateSelectionFromEvent: anEvent
+	self updateSelectionFromEvent: anEvent
 ]
 
 { #category : #'mouse handlers' }
@@ -68,12 +67,12 @@ ToListSecondarySelectionElementEventHandler >> mouseMoveEvent: anEvent [
 	target := anEvent currentTarget.
 	infinite := target infinite.
 	globalPosition := anEvent position.
-	target layoutCritical: [
-		childNode := infinite children
-			             detect: [ :node |
-				             node holder isSelectable and: [
-					             node containsGlobalPoint: globalPosition ] ]
-			             ifNone: [  ] ].
+
+	childNode := infinite children
+		             detect: [ :node |
+			             node holder isSelectable and: [
+				             node containsGlobalPoint: globalPosition ] ]
+		             ifNone: [  ].
 	childNode ifNil: [
 		target secondarySelecter deselectAll.
 		^ self ].
diff --git a/src/Toplo-Widget-List/ToListSelectionMode.class.st b/src/Toplo-Widget-List/ToListSelectionMode.class.st
index 325bd333..83592b0a 100644
--- a/src/Toplo-Widget-List/ToListSelectionMode.class.st
+++ b/src/Toplo-Widget-List/ToListSelectionMode.class.st
@@ -1,40 +1,233 @@
 Class {
 	#name : #ToListSelectionMode,
-	#superclass : #ToListAbstractSelectionMode,
+	#superclass : #Object,
 	#instVars : [
+		'selectionModel',
+		'operator',
+		'selecter',
+		'multiple',
+		'requestFocusOnMouseDown',
 		'preserveSelectionOnFocused',
-		'operator'
+		'selectOnMouseDown',
+		'enabled',
+		'primary'
 	],
 	#category : #'Toplo-Widget-List-Selection-Mode'
 }
 
+{ #category : #'instance creation' }
+ToListSelectionMode class >> primaryOn: anElement [
+
+	| primary |
+	primary := self new.
+	primary
+		operator: (ToPrimarySelectionModelOperator on: anElement);
+		selectionModel: (anElement newPrimarySelectionModel onInstalledIn: anElement).
+	primary primary: true.
+	^ primary
+]
+
+{ #category : #'instance creation' }
+ToListSelectionMode class >> secondaryOn: anElement [
+
+	| secondary |
+	secondary := self new.
+	secondary
+		operator: (ToSecondarySelectionModelOperator on: anElement);
+		selectionModel: (anElement newSecondarySelectionModel onInstalledIn: anElement).
+	secondary primary: false.
+	^ secondary
+]
+
+{ #category : #testing }
+ToListSelectionMode >> allowRequestFocusOnMouseDown [
+
+	| max |
+	self isDisabled ifTrue: [ ^ self requestFocusOnMouseDown ].
+	max := self isMultipleSelection
+		       ifTrue: [ 1 ]
+		       ifFalse: [ 0 ].
+	self selectedIndexesCount > max ifTrue: [
+		self preserveSelectionOnFocused ifTrue: [ ^ false ] ].
+	^ self requestFocusOnMouseDown
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> beMultipleSelection [
+
+	self multiple: true
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> beSingleSelection [
+
+	self multiple: false
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> disable [
+
+	self enabled: false
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> enable [
+
+	self enabled: true
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> enabled [
+
+	^ enabled
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> enabled: aBoolean [
+
+	enabled := aBoolean.
+	selecter := nil
+]
+
 { #category : #initialization }
 ToListSelectionMode >> initialize [ 
 
 	super initialize.
-	preserveSelectionOnFocused := true
+	requestFocusOnMouseDown := true.
+	preserveSelectionOnFocused := true.
+	selectOnMouseDown := false.
+	multiple := true.
+	enabled := true
+
+]
+
+{ #category : #testing }
+ToListSelectionMode >> isDisabled [
+
+	^ self enabled not
+]
+
+{ #category : #testing }
+ToListSelectionMode >> isEnabled [
+
+	^ self enabled
+]
+
+{ #category : #testing }
+ToListSelectionMode >> isMultipleSelection [
+
+	^ self multiple
+]
+
+{ #category : #testing }
+ToListSelectionMode >> isPrimarySelectionMode [
+
+	^ primary
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> itemCount [
+
+	^ self selectionModel itemCount
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> multiple [
+
+	^ multiple
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> multiple: aBoolean [
+
+	multiple := aBoolean
+]
+
+{ #category : #'instance creation' }
+ToListSelectionMode >> newSelecter [
+
+	^ self isDisabled
+		  ifTrue: [ ToNoneSelecter new ]
+		  ifFalse: [
+			  (ToPredefinedSelecter
+				   selectionModel: self selectionModel
+				   operator: self operator)
+				  multiple: self isMultipleSelection;
+				  yourself ]
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> nodeEventHandlerClasses [
+
+	^ self isMultipleSelection
+		  ifTrue: [ { ToListNodeMultiSelectionClickEventHandler } ]
+		  ifFalse: [ { ToListNodeSingleSelectionClickEventHandler } ]
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> onAddedNode: aNode [
+
+	self nodeEventHandlerClasses do: [ :cls | aNode addEventHandler: cls new ]
 ]
 
 { #category : #'event handling' }
 ToListSelectionMode >> onClickEvent: anEvent onNode: aNode [
 
-
+	self isDisabled ifTrue: [ ^ self ].
+	self isMultipleSelection ifTrue: [
+		self onMultiSelectionClickEvent: anEvent onNode: aNode.
+		^ self ].
+	self onSingleSelectionClickEvent: anEvent onNode: aNode
 ]
 
 { #category : #'api - hooks' }
 ToListSelectionMode >> onInstalledIn: anElement [
+]
 
-	super onInstalledIn: anElement.
-	operator onInstalledIn: anElement.
-	selecter operator: operator
+{ #category : #'event handling' }
+ToListSelectionMode >> onMultiSelectionClickEvent: anEvent onNode: aNode [
+
+	anEvent sourceEvent modifiers isShift ifTrue: [
+		| curr |
+		curr := self selecter currentIndex.
+		self selecter selectIndex: curr to: aNode holder position.
+		^ self ].
+	(anEvent sourceEvent modifiers isPrimaryModifier or: [
+		 self selectOnMouseDown ]) ifTrue: [
+		self selectOrDeselectOnNode: aNode.
+		^ self ].
+	self selecter selectOnlyIndex: aNode holder position
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> onRemovedNode: aNode [
+
+	(aNode eventDispatcher handlers select: [ :handler |
+		 self nodeEventHandlerClasses anySatisfy: [ :cls |
+			 cls == handler class ] ]) do: [ :handler |
+		aNode removeEventHandler: handler ]
+]
+
+{ #category : #'event handling' }
+ToListSelectionMode >> onSingleSelectionClickEvent: anEvent onNode: aNode [
+
+	(anEvent sourceEvent modifiers isPrimaryModifier or: [
+		 self selectOnMouseDown ]) ifTrue: [
+		| index |
+		index := aNode holder position.
+		(self selectionModel containsIndex: index) ifTrue: [
+			^ self selecter deselectIndex: index ] ].
+	self selecter selectOnlyIndex: aNode holder position
 ]
 
 { #category : #'api - hooks' }
 ToListSelectionMode >> onUninstalledIn: anElement [
 
+	selecter := nil.
+	selectionModel onUninstalledIn: anElement.
+	selectionModel := nil.
 	operator onUninstalledIn: anElement.
-	super onUninstalledIn: anElement. 
-
+	operator := nil
 ]
 
 { #category : #accessing }
@@ -60,3 +253,82 @@ ToListSelectionMode >> preserveSelectionOnFocused: aBoolean [
 
 	preserveSelectionOnFocused := aBoolean
 ]
+
+{ #category : #accessing }
+ToListSelectionMode >> primary [
+
+	^ primary
+
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> primary: aBoolean [
+
+	primary := aBoolean
+
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> requestFocusOnMouseDown [
+
+	^ requestFocusOnMouseDown
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> requestFocusOnMouseDown: aBoolean [
+
+	requestFocusOnMouseDown := aBoolean 
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> selectOnMouseDown [
+
+	^ selectOnMouseDown
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> selectOnMouseDown: aBoolean [
+
+	selectOnMouseDown := aBoolean
+]
+
+{ #category : #'event handling' }
+ToListSelectionMode >> selectOrDeselectOnNode: aNode [
+
+	| index target |
+	index := aNode holder position.
+	target := aNode holder listElement.
+	(target selectionModel containsIndex: index)
+		ifTrue: [ self selecter deselectIndex: index ]
+		ifFalse: [ self selecter selectIndex: index ]
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> selectedIndexes [
+
+	^ self selectionModel indexes
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> selectedIndexesCount [
+
+	^ self selectionModel selectedIndexesCount
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> selecter [
+
+	^ selecter ifNil: [ selecter := self newSelecter ]
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> selectionModel [
+
+	^ selectionModel
+]
+
+{ #category : #accessing }
+ToListSelectionMode >> selectionModel: aSelectionModel [
+
+	selectionModel := aSelectionModel
+]
diff --git a/src/Toplo-Widget-List/ToListSingleSelectionMode.class.st b/src/Toplo-Widget-List/ToListSingleSelectionMode.class.st
deleted file mode 100644
index ced07534..00000000
--- a/src/Toplo-Widget-List/ToListSingleSelectionMode.class.st
+++ /dev/null
@@ -1,45 +0,0 @@
-Class {
-	#name : #ToListSingleSelectionMode,
-	#superclass : #ToListSelectionMode,
-	#category : #'Toplo-Widget-List-Selection-Mode'
-}
-
-{ #category : #testing }
-ToListSingleSelectionMode >> allowRequestFocusOnMouseDown [
-
-	( self selectedIndexesCount > 0 )
-		ifTrue: [ self preserveSelectionOnFocused ifTrue: [ ^ false ] ].
-	^ super allowRequestFocusOnMouseDown
-]
-
-{ #category : #testing }
-ToListSingleSelectionMode >> isMultipleSelection [
-
-	^ false
-]
-
-{ #category : #'instance creation' }
-ToListSingleSelectionMode >> newSelecterIn: anElement [
-
-	^ ToSingleSelectionModelSelecter new 
-]
-
-{ #category : #accessing }
-ToListSingleSelectionMode >> nodeEventHandlerClasses [ 
-
-	^ { ToListNodeSingleSelectionClickEventHandler }
-
-]
-
-{ #category : #'event handling' }
-ToListSingleSelectionMode >> onClickEvent: anEvent onNode: aNode [
-
-	super onClickEvent: anEvent onNode: aNode.
-	(anEvent sourceEvent modifiers isPrimaryModifier or: [ self selectOnMouseDown ])
-		ifTrue: [
-			| index |
-			index := aNode holder position.
-			(self selectionModel containsIndex: index) ifTrue: [
-				^ self selecter deselectIndex: index ] ].
-	self selecter selectOnlyIndex: aNode holder position
-]
diff --git a/src/Toplo-Widget-List/ToMultiSelectionModelSelecter.class.st b/src/Toplo-Widget-List/ToMultiSelectionModelSelecter.class.st
deleted file mode 100644
index a33e6b1b..00000000
--- a/src/Toplo-Widget-List/ToMultiSelectionModelSelecter.class.st
+++ /dev/null
@@ -1,40 +0,0 @@
-Class {
-	#name : #ToMultiSelectionModelSelecter,
-	#superclass : #ToSelectionModelSelecter,
-	#category : #'Toplo-Widget-List-Selection-Selecter'
-}
-
-{ #category : #operations }
-ToMultiSelectionModelSelecter >> selectAll [
-
-	self addCommand: (ToWholeSelectionCommand new
-			 operator: self operator;
-			 operation: ToAddSelectionOperation new;
-			 yourself).
-	self selectionModel itemCount > 0
-		ifTrue: [ self changeCurrentIndexWith: 1 ]
-		ifFalse: [ self changeCurrentIndexWith: 0 ]
-]
-
-{ #category : #operations }
-ToMultiSelectionModelSelecter >> selectIndex: aStartIndex to: anEndIndex [
-
-	self addCommand: (ToIntervalSelectionCommand new
-			 operator: self operator;
-			 from: aStartIndex to: anEndIndex;
-			 operation: ToAddSelectionOperation new).
-	self changeCurrentIndexWith: anEndIndex
-]
-
-{ #category : #operations }
-ToMultiSelectionModelSelecter >> selectIndexes: anArray [
-
-	self addCommand: (ToIndexesSelectionCommand new
-			 operator: self operator;
-			 indexes: anArray;
-			 operation: ToAddSelectionOperation new).
-	anArray ifEmpty: [
-		self changeCurrentIndexWith: 0.
-		^ self ].
-	self changeCurrentIndexWith: anArray last
-]
diff --git a/src/Toplo-Widget-List/ToNodeHolder.class.st b/src/Toplo-Widget-List/ToNodeHolder.class.st
index 0fb9b7ff..321c0313 100644
--- a/src/Toplo-Widget-List/ToNodeHolder.class.st
+++ b/src/Toplo-Widget-List/ToNodeHolder.class.st
@@ -15,10 +15,7 @@ ToNodeHolder >> bindDataItem: aData [
 { #category : #testing }
 ToNodeHolder >> isDisabled [
 
-	^ self listElement
-		  ifNil: [ true ]
-		  ifNotNil: [ :le |
-		  le disabledSelectionModel containsIndex: self position ]
+	^ self listElement selectionModel isDisabledIndex: self position
 ]
 
 { #category : #testing }
@@ -30,10 +27,7 @@ ToNodeHolder >> isEnabled [
 { #category : #testing }
 ToNodeHolder >> isHidden [
 
-	^ self listElement
-		  ifNil: [ true ]
-		  ifNotNil: [ :le |
-		  le hiddenSelectionModel containsIndex: self position ]
+	^ self listElement selectionModel isHiddenIndex: self position
 ]
 
 { #category : #testing }
@@ -45,8 +39,5 @@ ToNodeHolder >> isSelectable [
 { #category : #testing }
 ToNodeHolder >> isUnselectable [
 
-	^ self listElement
-		  ifNil: [ true ]
-		  ifNotNil: [ :le |
-		  le unselectableSelectionModel containsIndex: self position ]
+	^ self listElement selectionModel isUnselectableIndex: self position
 ]
diff --git a/src/Toplo-Widget-List/ToNoneSelecter.class.st b/src/Toplo-Widget-List/ToNoneSelecter.class.st
new file mode 100644
index 00000000..447987fa
--- /dev/null
+++ b/src/Toplo-Widget-List/ToNoneSelecter.class.st
@@ -0,0 +1,102 @@
+Class {
+	#name : #ToNoneSelecter,
+	#superclass : #ToAbstractListElementSelecter,
+	#category : #'Toplo-Widget-List-Selection-Selecter'
+}
+
+{ #category : #testing }
+ToNoneSelecter >> containsIndex: anIndex [
+
+	^ false
+]
+
+{ #category : #copying }
+ToNoneSelecter >> copySelectionFrom: aSourceSelectionModel [
+
+
+]
+
+{ #category : #accessing }
+ToNoneSelecter >> currentIndex [
+
+	^ 0
+]
+
+{ #category : #operations }
+ToNoneSelecter >> deselectAll [
+
+]
+
+{ #category : #operations }
+ToNoneSelecter >> deselectIndex: anIndex [
+]
+
+{ #category : #operations }
+ToNoneSelecter >> deselectIndex: aStartIndex to: anEndIndex [
+
+]
+
+{ #category : #operations }
+ToNoneSelecter >> deselectIndexes: anArray [
+
+]
+
+{ #category : #private }
+ToNoneSelecter >> nextDeselectedIndex [
+
+	^ 0
+]
+
+{ #category : #private }
+ToNoneSelecter >> nextSelectableIndex [
+
+	^ 0
+]
+
+{ #category : #private }
+ToNoneSelecter >> previousDeselectedIndex [
+
+	^ 0
+]
+
+{ #category : #private }
+ToNoneSelecter >> previousSelectableIndex [
+
+	^ 0
+]
+
+{ #category : #operations }
+ToNoneSelecter >> scrollToIndex: anIndex [
+
+
+]
+
+{ #category : #operations }
+ToNoneSelecter >> selectAll [
+]
+
+{ #category : #operations }
+ToNoneSelecter >> selectIndex: anIndex [
+]
+
+{ #category : #operations }
+ToNoneSelecter >> selectIndex: aStartIndex to: anEndIndex [
+]
+
+{ #category : #operations }
+ToNoneSelecter >> selectIndexes: anArray [
+]
+
+{ #category : #operations }
+ToNoneSelecter >> selectOnlyIndex: anIndex [
+]
+
+{ #category : #operations }
+ToNoneSelecter >> selectOnlyIndexes: anArray [
+]
+
+{ #category : #accessing }
+ToNoneSelecter >> selectedIndexes [
+
+	^ #(  )
+]
diff --git a/src/Toplo-Widget-List/ToNoneSelectionModelSelecter.class.st b/src/Toplo-Widget-List/ToNoneSelectionModelSelecter.class.st
deleted file mode 100644
index c5be52d8..00000000
--- a/src/Toplo-Widget-List/ToNoneSelectionModelSelecter.class.st
+++ /dev/null
@@ -1,96 +0,0 @@
-Class {
-	#name : #ToNoneSelectionModelSelecter,
-	#superclass : #ToAbstractSelectionModelSelecter,
-	#category : #'Toplo-Widget-List-Selection-Selecter'
-}
-
-{ #category : #copying }
-ToNoneSelectionModelSelecter >> copySelectionFrom: aSourceSelectionModel [
-
-
-]
-
-{ #category : #accessing }
-ToNoneSelectionModelSelecter >> currentIndex [
-
-	^ 0
-]
-
-{ #category : #operations }
-ToNoneSelectionModelSelecter >> deselectAll [
-
-]
-
-{ #category : #operations }
-ToNoneSelectionModelSelecter >> deselectIndex: anIndex [
-]
-
-{ #category : #operations }
-ToNoneSelectionModelSelecter >> deselectIndex: aStartIndex to: anEndIndex [
-
-]
-
-{ #category : #operations }
-ToNoneSelectionModelSelecter >> deselectIndexes: anArray [
-
-]
-
-{ #category : #private }
-ToNoneSelectionModelSelecter >> nextDeselectedIndex [
-
-	^ 0
-]
-
-{ #category : #private }
-ToNoneSelectionModelSelecter >> nextSelectableIndex [
-
-	^ 0
-]
-
-{ #category : #private }
-ToNoneSelectionModelSelecter >> previousDeselectedIndex [
-
-	^ 0
-]
-
-{ #category : #private }
-ToNoneSelectionModelSelecter >> previousSelectableIndex [
-
-	^ 0
-]
-
-{ #category : #operations }
-ToNoneSelectionModelSelecter >> scrollToIndex: anIndex [
-
-
-]
-
-{ #category : #operations }
-ToNoneSelectionModelSelecter >> selectAll [
-]
-
-{ #category : #operations }
-ToNoneSelectionModelSelecter >> selectIndex: anIndex [
-]
-
-{ #category : #operations }
-ToNoneSelectionModelSelecter >> selectIndex: aStartIndex to: anEndIndex [
-]
-
-{ #category : #operations }
-ToNoneSelectionModelSelecter >> selectIndexes: anArray [
-]
-
-{ #category : #operations }
-ToNoneSelectionModelSelecter >> selectOnlyIndex: anIndex [
-]
-
-{ #category : #operations }
-ToNoneSelectionModelSelecter >> selectOnlyIndexes: anArray [
-]
-
-{ #category : #accessing }
-ToNoneSelectionModelSelecter >> selectedIndexes [
-
-	^ #(  )
-]
diff --git a/src/Toplo-Widget-List/ToPredefinedSelecter.class.st b/src/Toplo-Widget-List/ToPredefinedSelecter.class.st
new file mode 100644
index 00000000..1a85e516
--- /dev/null
+++ b/src/Toplo-Widget-List/ToPredefinedSelecter.class.st
@@ -0,0 +1,14 @@
+Class {
+	#name : #ToPredefinedSelecter,
+	#superclass : #ToEffectiveSelecter,
+	#category : #'Toplo-Widget-List-Selection-Selecter'
+}
+
+{ #category : #'instance creation' }
+ToPredefinedSelecter class >> selectionModel: aSelectionModel operator: anOperator [
+
+	^ self new
+		  selectionModel: aSelectionModel;
+		  operator: anOperator;
+		  yourself
+]
diff --git a/src/Toplo-Widget-List/ToPrimarySelectionModelOperator.class.st b/src/Toplo-Widget-List/ToPrimarySelectionModelOperator.class.st
index a870a60b..54ba83c8 100644
--- a/src/Toplo-Widget-List/ToPrimarySelectionModelOperator.class.st
+++ b/src/Toplo-Widget-List/ToPrimarySelectionModelOperator.class.st
@@ -21,7 +21,7 @@ ToPrimarySelectionModelOperator >> notifySelectionChangedAfter: aCommand in: aTa
 			 yourself).
 
 	eventToNotify := ToListPrimarySelectionChangedEvent new
-		                 selectionModel: self selectionModel;
+		                 selectionModel: aCommand selectionModel;
 		                 yourself.
 
 	preNotification := ToListPrimarySelectionChangePreNotificationEvent
diff --git a/src/Toplo-Widget-List/ToSecondarySelectionModelOperator.class.st b/src/Toplo-Widget-List/ToSecondarySelectionModelOperator.class.st
index fd641644..d1aab254 100644
--- a/src/Toplo-Widget-List/ToSecondarySelectionModelOperator.class.st
+++ b/src/Toplo-Widget-List/ToSecondarySelectionModelOperator.class.st
@@ -25,6 +25,6 @@ ToSecondarySelectionModelOperator >> notifySelectionChangedAfter: aCommand in: a
 
 	aTarget dispatchEvent:
 		(ToListSecondarySelectionChangedEvent new
-			 selectionModel: self selectionModel;
+			 selectionModel: aCommand selectionModel;
 			 yourself)
 ]
diff --git a/src/Toplo-Widget-List/ToSelectionModel.class.st b/src/Toplo-Widget-List/ToSelectionModel.class.st
index 314c68be..479d5499 100644
--- a/src/Toplo-Widget-List/ToSelectionModel.class.st
+++ b/src/Toplo-Widget-List/ToSelectionModel.class.st
@@ -27,7 +27,9 @@ ToSelectionModel >> containsIndex: anIndex [
 { #category : #copying }
 ToSelectionModel >> copySelectionFrom: anotherSelectionModel [
 
-	anotherSelectionModel underlyingModelDo: [ :ulm | underlyingModel := ulm copy ]
+	anotherSelectionModel ifNil: [ ^ self ].
+	anotherSelectionModel underlyingModelDo: [ :ulm |
+		underlyingModel := ulm copy ]
 ]
 
 { #category : #updating }
@@ -68,6 +70,12 @@ ToSelectionModel >> firstIndex [
 		^ ulm from + 1 ]
 ]
 
+{ #category : #testing }
+ToSelectionModel >> hasUnselectableInInterval: anInterval [
+
+	^ false
+]
+
 { #category : #comparing }
 ToSelectionModel >> hash [
 
@@ -97,12 +105,24 @@ ToSelectionModel >> initialize [
 	underlyingModel := BlCompositeSelection new
 ]
 
+{ #category : #testing }
+ToSelectionModel >> isDisabledIndex: anIndex [
+
+	^ false
+]
+
 { #category : #testing }
 ToSelectionModel >> isEmpty [
 
 	self underlyingModelDo: [ :ulm | ^ ulm isEmpty ]
 ]
 
+{ #category : #testing }
+ToSelectionModel >> isHiddenIndex: anIndex [
+
+	^ false
+]
+
 { #category : #testing }
 ToSelectionModel >> isNotEmpty [
 
@@ -342,6 +362,14 @@ ToSelectionModel >> transferIndex: anIndex from: anotherPrimarySelectionModel as
 		ifFalse: [ self deselectIndex: targetIndex ]
 ]
 
+{ #category : #updating }
+ToSelectionModel >> transferSelectionFromIndex: anIndex toIndex: targetIndex in: anotherPrimarySelectionModel [ 
+
+	(self containsIndex: anIndex)
+		ifTrue: [ anotherPrimarySelectionModel selectIndex: targetIndex ]
+		ifFalse: [ anotherPrimarySelectionModel deselectIndex: targetIndex ]
+]
+
 { #category : #accessing }
 ToSelectionModel >> underlyingModel [
 
diff --git a/src/Toplo-Widget-List/ToSelectionModelOperator.class.st b/src/Toplo-Widget-List/ToSelectionModelOperator.class.st
index 7b58eb0a..bb4b40dd 100644
--- a/src/Toplo-Widget-List/ToSelectionModelOperator.class.st
+++ b/src/Toplo-Widget-List/ToSelectionModelOperator.class.st
@@ -1,9 +1,6 @@
 Class {
 	#name : #ToSelectionModelOperator,
 	#superclass : #ToCommandOperator,
-	#instVars : [
-		'selectionModel'
-	],
 	#category : #'Toplo-Widget-List-Command-Selection'
 }
 
@@ -13,36 +10,40 @@ ToSelectionModelOperator >> addIndexesSelectionCommand: aCommand [
 	| intervals |
 	aCommand indexes ifEmpty: [ ^ self ].
 	aCommand operation deselectAllBefore ifTrue: [
-		self selectionModel deselectAll ].
+		aCommand selectionModel deselectAll ].
 	intervals := self intervalsIn: aCommand indexes.
 	intervals do: [ :i |
-		self selectionModel selectIndex: i first to: i last ]
+		aCommand selectionModel selectIndex: i first to: i last ]
 ]
 
 { #category : #'command operations' }
 ToSelectionModelOperator >> addIntervalSelectionCommand: aCommand [
 
 	aCommand operation deselectAllBefore ifTrue: [
-		self selectionModel deselectAll ].
-	self selectionModel selectIndex: aCommand from to: aCommand to
+		aCommand selectionModel deselectAll ].
+	aCommand selectionModel selectIndex: aCommand from to: aCommand to
 ]
 
 { #category : #'command operations' }
 ToSelectionModelOperator >> addWholeSelectionCommand: aCommand [
 
-	self selectionModel selectAll
+	aCommand selectionModel selectAll
 ]
 
 { #category : #'command application' }
 ToSelectionModelOperator >> applyCommand: aCommand in: aTarget [
 
 	| previousModel |
-	previousModel := self selectionModel copy.
+	previousModel := aCommand selectionModel copy.
 	super applyCommand: aCommand in: aTarget.
-	aCommand selectionChanged: previousModel ~= self selectionModel.
+	aCommand selectionChanged: previousModel ~= aCommand selectionModel.
 	self notifySelectionChangedAfter: aCommand in: aTarget
 ]
 
+{ #category : #accessing }
+ToSelectionModelOperator >> currentIndex: anIndex [
+]
+
 { #category : #private }
 ToSelectionModelOperator >> intervalsIn: aCollection [
 	" return an array of intervals #( 2 3 4 6 7 8 ) -> { 2 to: 4. 6 to: 8 } "
@@ -67,12 +68,6 @@ ToSelectionModelOperator >> intervalsIn: aCollection [
 		  g ifNotNil: [ stream nextPut: g ] ]
 ]
 
-{ #category : #accessing }
-ToSelectionModelOperator >> itemCount [
-
-	^ self selectionModel itemCount
-]
-
 { #category : #'private command application' }
 ToSelectionModelOperator >> notifySelectionChangedAfter: aCommand in: aTarget [
 
@@ -85,49 +80,37 @@ ToSelectionModelOperator >> removeIndexesSelectionCommand: aCommand [
 	| intervals |
 	aCommand indexes ifEmpty: [ ^ self ].
 	intervals := self intervalsIn: aCommand indexes.
-	intervals do: [ :i | self selectionModel deselectIndex: i first to: i last ]
+	intervals do: [ :i | aCommand selectionModel deselectIndex: i first to: i last ]
 ]
 
 { #category : #'command operations' }
 ToSelectionModelOperator >> removeIntervalSelectionCommand: aCommand [
 
-	self selectionModel deselectIndex: aCommand from to: aCommand to
+	aCommand selectionModel deselectIndex: aCommand from to: aCommand to
 ]
 
 { #category : #'command operations' }
 ToSelectionModelOperator >> removeWholeSelectionCommand: aCommand [
 
-	self selectionModel deselectAll
-]
-
-{ #category : #accessing }
-ToSelectionModelOperator >> selectionModel [
-
-	^ selectionModel
-]
-
-{ #category : #accessing }
-ToSelectionModelOperator >> selectionModel: aSelectionModel [
-
-	selectionModel := aSelectionModel
+	aCommand selectionModel deselectAll
 ]
 
 { #category : #'command operations' }
 ToSelectionModelOperator >> selectionModelCopyFromCommand: aCopyFromCommand in: aTarget [
 
-	self selectionModel copySelectionFrom:  aCopyFromCommand sourceSelectionModel
+	aCopyFromCommand selectionModel copySelectionFrom:  aCopyFromCommand sourceSelectionModel
 ]
 
 { #category : #'command operations' }
 ToSelectionModelOperator >> selectionModelShiftCommand: aShiftCommand in: aEventTarget [
 
-	self selectionModel shift: aShiftCommand itemCount from: aShiftCommand fromIndex.
+	aShiftCommand selectionModel shift: aShiftCommand itemCount from: aShiftCommand fromIndex.
 	" Must take car of unselectable items: "
 	" for adding items, no need to notify change because it is already done here but when
 	when removing items (itemCount < 0) one have to notify change to the datasource 
 	to correctly update the UI"
 	aShiftCommand itemCount > 0 ifTrue: [ ^ self ].
-	aShiftCommand fromIndex <= self selectionModel itemCount ifTrue: [
+	aShiftCommand fromIndex <= aShiftCommand selectionModel itemCount ifTrue: [
 		"aEventTarget dataSource notifyChanged" ]
 
 ]
diff --git a/src/Toplo-Widget-List/ToSelectionModelSelecter.class.st b/src/Toplo-Widget-List/ToSelectionModelSelecter.class.st
deleted file mode 100644
index 7932e4a2..00000000
--- a/src/Toplo-Widget-List/ToSelectionModelSelecter.class.st
+++ /dev/null
@@ -1,273 +0,0 @@
-Class {
-	#name : #ToSelectionModelSelecter,
-	#superclass : #ToAbstractSelectionModelSelecter,
-	#instVars : [
-		'currentIndex',
-		'operator'
-	],
-	#category : #'Toplo-Widget-List-Selection-Selecter'
-}
-
-{ #category : #adding }
-ToSelectionModelSelecter >> addCommand: aCommand [
-
-	self operator addCommand: aCommand
-]
-
-{ #category : #operations }
-ToSelectionModelSelecter >> changeCurrentIndexWith: anIndex [
-
-	self currentIndex: anIndex
-]
-
-{ #category : #copying }
-ToSelectionModelSelecter >> copySelectionFrom: aSourceSelectionModel [
-
-	self addCommand: (ToSelectionModelCopyFromCommand new
-			 operator: self operator;
-			 sourceSelectionModel: aSourceSelectionModel;
-			 yourself).
-	self changeCurrentIndexWith: 0
-]
-
-{ #category : #accessing }
-ToSelectionModelSelecter >> currentIndex [
-
-	^ currentIndex
-]
-
-{ #category : #accessing }
-ToSelectionModelSelecter >> currentIndex: anIndex [
-
-	currentIndex := anIndex
-]
-
-{ #category : #operations }
-ToSelectionModelSelecter >> deselectAll [
-
-	self addCommand: (ToWholeSelectionCommand new
-			 operator: self operator;
-			 operation: ToRemoveSelectionOperation new;
-			 yourself).
-	self changeCurrentIndexWith: 0
-]
-
-{ #category : #operations }
-ToSelectionModelSelecter >> deselectIndex: anIndex [
-
-	self addCommand: (ToIntervalSelectionCommand new
-			 operator: self operator;
-			 from: anIndex to: anIndex;
-			 operation: ToRemoveSelectionOperation new)
-]
-
-{ #category : #operations }
-ToSelectionModelSelecter >> deselectIndex: aStartIndex to: anEndIndex [
-
-	self addCommand: (ToIntervalSelectionCommand new
-			 operator: self operator;
-			 from: aStartIndex to: anEndIndex;
-			 operation: ToRemoveSelectionOperation new).
-	self changeCurrentIndexWith: (aStartIndex min: anEndIndex)
-]
-
-{ #category : #operations }
-ToSelectionModelSelecter >> deselectIndexes: anArray [
-
-	self addCommand: (ToIndexesSelectionCommand new
-			 operator: self operator;
-			 indexes: anArray;
-			 operation: ToRemoveSelectionOperation new).
-	self changeCurrentIndexWith: 0
-]
-
-{ #category : #accessing }
-ToSelectionModelSelecter >> itemCount [
-
-	^ self selectionModel itemCount
-]
-
-{ #category : #private }
-ToSelectionModelSelecter >> nextDeselectedIndex [
-
-	^ self sideIdx: 1
-]
-
-{ #category : #private }
-ToSelectionModelSelecter >> nextSelectableIndex [
-
-	self currentIndex isZero
-		ifTrue: [
-			self itemCount isZero ifTrue: [ ^ 0 ].
-			^ self nextSelectableIndexStartingAt: 1 ]
-		ifFalse: [
-			self currentIndex
-			< (self previousSelectableIndexStartingAt: self itemCount)
-				ifFalse: [ ^ self nextSelectableIndexStartingAt: 1 ] ].
-	^ self nextSelectableIndexStartingAt: self currentIndex + 1
-]
-
-{ #category : #private }
-ToSelectionModelSelecter >> nextSelectableIndexStartingAt: anIndex [
-
-	^ self selectionModel nextSelectableIndexStartingAt: anIndex
-]
-
-{ #category : #private }
-ToSelectionModelSelecter >> nextSelectableIndexToScrollTo [
-
-	| next |
-	next := self nextSelectableIndex.
-	" not on the last selectable position -> just return the next index else, return 1 or 0"
-	^ self currentIndex < (self previousSelectableIndexStartingAt: self selectionModel itemCount)
-		  ifTrue: [ next ]
-		  ifFalse: [
-			  self selectionModel itemCount > 0
-				  ifTrue: [ 1 ]
-				  ifFalse: [ 0 ] ]
-]
-
-{ #category : #'api - hooks' }
-ToSelectionModelSelecter >> onInstalledIn: anEventTarget [
-
-	super onInstalledIn: anEventTarget.
-	currentIndex := 0
-]
-
-{ #category : #'api - hooks' }
-ToSelectionModelSelecter >> onUninstalledIn: anEventTarget [
-
-	super onUninstalledIn: anEventTarget.
-	operator := nil.
-	currentIndex := 0
-]
-
-{ #category : #accessing }
-ToSelectionModelSelecter >> operator [
-
-	^ operator
-]
-
-{ #category : #accessing }
-ToSelectionModelSelecter >> operator: anOperator [
-
-	operator := anOperator
-]
-
-{ #category : #private }
-ToSelectionModelSelecter >> previousDeselectedIndex [
-
-	^ self sideIdx: -1
-]
-
-{ #category : #private }
-ToSelectionModelSelecter >> previousSelectableIndex [
-
-	self currentIndex isZero
-		ifTrue: [
-			self itemCount isZero ifTrue: [ ^ 0 ].
-			^ self previousSelectableIndexStartingAt: self itemCount ]
-		ifFalse: [ self currentIndex > (self nextSelectableIndexStartingAt: 1) 
-			ifFalse: [ ^ self previousSelectableIndexStartingAt: self itemCount ] ].
-	^ self previousSelectableIndexStartingAt: self currentIndex - 1
-]
-
-{ #category : #private }
-ToSelectionModelSelecter >> previousSelectableIndexStartingAt: anIndex [
-
-	^ self selectionModel previousSelectableIndexStartingAt: anIndex
-]
-
-{ #category : #private }
-ToSelectionModelSelecter >> previousSelectableIndexToScrollTo [
-
-	| prev |
-	prev := self previousSelectableIndex.
-	" not exactly on the first selectable position -> just return the previous index else, return self itemCount or 0"
-	^ self currentIndex > (self nextSelectableIndexStartingAt: 1)
-		  ifTrue: [ prev ]
-		  ifFalse: [
-			  self selectionModel itemCount > 0
-				  ifTrue: [ self selectionModel itemCount ]
-				  ifFalse: [ 0 ] ]
-]
-
-{ #category : #operations }
-ToSelectionModelSelecter >> scrollToIndex: anIndex [
-
-	self itemCount >= anIndex ifTrue: [
-		self addCommand: (ToListScrollCommand new
-				 operator: self operator;
-				 index: anIndex;
-				 yourself) ]
-]
-
-{ #category : #operations }
-ToSelectionModelSelecter >> selectIndex: anIndex [
-
-	self addCommand: (ToIntervalSelectionCommand new
-			 operator: self operator;
-			 from: anIndex to: anIndex;
-			 operation: ToAddSelectionOperation new).
-	self changeCurrentIndexWith: anIndex
-]
-
-{ #category : #operations }
-ToSelectionModelSelecter >> selectOnlyIndex: anIndex [
-
-	(self selectionModel selectedIndexesCount = 1 and: [
-		 self selectionModel firstIndex = anIndex ]) ifTrue: [ ^ self ].
-	self addCommand: (ToIntervalSelectionCommand new
-			 operator: self operator;
-			 from: anIndex to: anIndex;
-			 operation: (ToAddSelectionOperation new
-					  deselectAllBefore: true;
-					  yourself)).
-	self changeCurrentIndexWith: anIndex
-]
-
-{ #category : #operations }
-ToSelectionModelSelecter >> selectOnlyIndexes: anArray [
-
-	anArray ifEmpty: [
-		self addCommand: (ToWholeSelectionCommand new
-				 operator: self operator;
-				 operation: ToRemoveSelectionOperation new).
-		self changeCurrentIndexWith: 0.
-		^ self ].
-	self addCommand: (ToIndexesSelectionCommand new
-			 operator: self operator;
-			 indexes: anArray;
-			 operation: (ToAddSelectionOperation new
-					  deselectAllBefore: true;
-					  yourself)).
-	self changeCurrentIndexWith: anArray last
-]
-
-{ #category : #accessing }
-ToSelectionModelSelecter >> selectedIndexes [
-
-	^ self selectionModel selectedIndexes
-]
-
-{ #category : #accessing }
-ToSelectionModelSelecter >> selectionModel [
-
-	^ self operator selectionModel
-]
-
-{ #category : #operations }
-ToSelectionModelSelecter >> shiftSelection: anInteger from: anIndex [
-
-	self addCommand: (ToSelectionModelShiftCommand new
-			 operator: self operator;
-			 itemCount: anInteger;
-			 fromIndex: anIndex;
-			 yourself)
-]
-
-{ #category : #private }
-ToSelectionModelSelecter >> sideIdx: aGap [
-
-	^ self selectionModel sideIdx: aGap startingAt: self currentIndex
-]
diff --git a/src/Toplo-Widget-List/ToSingleSelectionModelSelecter.class.st b/src/Toplo-Widget-List/ToSingleSelectionModelSelecter.class.st
deleted file mode 100644
index 7211645b..00000000
--- a/src/Toplo-Widget-List/ToSingleSelectionModelSelecter.class.st
+++ /dev/null
@@ -1,45 +0,0 @@
-Class {
-	#name : #ToSingleSelectionModelSelecter,
-	#superclass : #ToSelectionModelSelecter,
-	#category : #'Toplo-Widget-List-Selection-Selecter'
-}
-
-{ #category : #operations }
-ToSingleSelectionModelSelecter >> selectAll [
-
-	ToInvalidElementCommand signal
-]
-
-{ #category : #operations }
-ToSingleSelectionModelSelecter >> selectIndex: anIndex [
-
-	self addCommand: (ToIntervalSelectionCommand new
-			 operator: self operator;
-			 from: anIndex to: anIndex;
-			 operation: (ToAddSelectionOperation new
-					  deselectAllBefore: true;
-					  yourself)).
-	self changeCurrentIndexWith: anIndex
-]
-
-{ #category : #operations }
-ToSingleSelectionModelSelecter >> selectIndex: aStartIndex to: anEndIndex [
-
-	aStartIndex ~= anEndIndex ifTrue: [ ^ ToInvalidElementCommand signal ].
-	self selectIndex: aStartIndex
-]
-
-{ #category : #operations }
-ToSingleSelectionModelSelecter >> selectIndexes: anArray [
-
-	anArray ifEmpty: [ ^ self ].
-	anArray size > 1 ifTrue: [ ^ ToInvalidElementCommand signal ].
-	self selectIndex: anArray first
-]
-
-{ #category : #operations }
-ToSingleSelectionModelSelecter >> selectOnlyIndexes: anArray [
-
-	anArray size > 1 ifTrue: [ ^ ToInvalidElementCommand signal ].
-	super selectOnlyIndexes: anArray
-]
diff --git a/src/Toplo-Widget-List/ToStandardSelectionModelOperator.class.st b/src/Toplo-Widget-List/ToStandardSelectionModelOperator.class.st
index d1a02ab4..52efb21a 100644
--- a/src/Toplo-Widget-List/ToStandardSelectionModelOperator.class.st
+++ b/src/Toplo-Widget-List/ToStandardSelectionModelOperator.class.st
@@ -1,5 +1,93 @@
 Class {
 	#name : #ToStandardSelectionModelOperator,
 	#superclass : #ToSelectionModelOperator,
+	#instVars : [
+		'currentIndex'
+	],
 	#category : #'Toplo-Widget-List-Command-Selection'
 }
+
+{ #category : #'instance creation' }
+ToStandardSelectionModelOperator class >> on: anElement [ 
+
+	^ self new
+		  onInstalledIn: anElement;
+		  yourself
+]
+
+{ #category : #'command operations' }
+ToStandardSelectionModelOperator >> addIndexesSelectionCommand: aCommand [
+
+	super addIndexesSelectionCommand: aCommand.
+	aCommand indexes ifEmpty: [
+		self changeCurrentIndexWith: 0.
+		^ self ].
+	self changeCurrentIndexWith: aCommand indexes last
+]
+
+{ #category : #'command operations' }
+ToStandardSelectionModelOperator >> addIntervalSelectionCommand: aCommand [
+
+	super addIntervalSelectionCommand: aCommand.
+	self changeCurrentIndexWith: aCommand to
+]
+
+{ #category : #'command operations' }
+ToStandardSelectionModelOperator >> addWholeSelectionCommand: aCommand [
+
+	super addWholeSelectionCommand: aCommand.
+	self changeCurrentIndexWith: aCommand selectionModel itemCount
+]
+
+{ #category : #accessing }
+ToStandardSelectionModelOperator >> changeCurrentIndexWith: anIndex [
+
+	self currentIndex: anIndex
+]
+
+{ #category : #accessing }
+ToStandardSelectionModelOperator >> currentIndex [
+
+	^ currentIndex
+]
+
+{ #category : #accessing }
+ToStandardSelectionModelOperator >> currentIndex: anIndex [
+
+	currentIndex := anIndex
+]
+
+{ #category : #initialization }
+ToStandardSelectionModelOperator >> initialize [
+
+	super initialize.
+	currentIndex := 0
+]
+
+{ #category : #'command operations' }
+ToStandardSelectionModelOperator >> removeIndexesSelectionCommand: aCommand [
+
+	super removeIndexesSelectionCommand: aCommand.
+	self changeCurrentIndexWith: 0
+]
+
+{ #category : #'command operations' }
+ToStandardSelectionModelOperator >> removeIntervalSelectionCommand: aCommand [
+
+	super removeIntervalSelectionCommand: aCommand.
+	self changeCurrentIndexWith: (aCommand from min: aCommand to)
+]
+
+{ #category : #'command operations' }
+ToStandardSelectionModelOperator >> removeWholeSelectionCommand: aCommand [
+
+	super removeWholeSelectionCommand: aCommand.
+	self changeCurrentIndexWith: 0
+]
+
+{ #category : #'command operations' }
+ToStandardSelectionModelOperator >> selectionModelCopyFromCommand: aCopyFromCommand in: aTarget [
+
+	super selectionModelCopyFromCommand: aCopyFromCommand in: aTarget.
+	self changeCurrentIndexWith: 0
+]
diff --git a/src/Toplo-Widget-List/ToUnselectableSelecter.class.st b/src/Toplo-Widget-List/ToUnselectableSelecter.class.st
new file mode 100644
index 00000000..e67d684b
--- /dev/null
+++ b/src/Toplo-Widget-List/ToUnselectableSelecter.class.st
@@ -0,0 +1,14 @@
+Class {
+	#name : #ToUnselectableSelecter,
+	#superclass : #ToAdditionalSelecter,
+	#category : #'Toplo-Widget-List-Selection-Selecter'
+}
+
+{ #category : #initialization }
+ToUnselectableSelecter >> initialize [ 
+
+	super initialize.
+	self eventClass: ToListUnselectableSelectionChangedEvent.
+	self uniqueId: #unselectable
+	
+]
diff --git a/src/Toplo-Widget-Select/ToMultipleSelectStrategy.class.st b/src/Toplo-Widget-Select/ToMultipleSelectStrategy.class.st
index 1e57d25f..058dbd4f 100644
--- a/src/Toplo-Widget-Select/ToMultipleSelectStrategy.class.st
+++ b/src/Toplo-Widget-Select/ToMultipleSelectStrategy.class.st
@@ -20,7 +20,6 @@ ToMultipleSelectStrategy >> isMultipleSelection [
 ToMultipleSelectStrategy >> onInstalledIn: aSelect [
 
 	aSelect listElement selectionMode:
-		(ToListMultipleSelectionMode new operator:
-			 (ToPrimarySelectionModelOperator new selectionModel: aSelect listElement selectionModel)).
+		(ToListSelectionMode primaryOn: aSelect listElement) beMultipleSelection.
 	super onInstalledIn: aSelect
 ]
diff --git a/src/Toplo-Widget-Select/ToSelectGroupSelectionChangedEvent.class.st b/src/Toplo-Widget-Select/ToSelectGroupSelectionChangedEvent.class.st
new file mode 100644
index 00000000..0a48761e
--- /dev/null
+++ b/src/Toplo-Widget-Select/ToSelectGroupSelectionChangedEvent.class.st
@@ -0,0 +1,5 @@
+Class {
+	#name : #ToSelectGroupSelectionChangedEvent,
+	#superclass : #ToListSelectionChangedEvent,
+	#category : #'Toplo-Widget-Select-Core'
+}
diff --git a/src/Toplo-Widget-Select/ToSelectListElement.class.st b/src/Toplo-Widget-Select/ToSelectListElement.class.st
index 636177de..f617ccf7 100644
--- a/src/Toplo-Widget-Select/ToSelectListElement.class.st
+++ b/src/Toplo-Widget-Select/ToSelectListElement.class.st
@@ -1,23 +1,31 @@
 Class {
 	#name : #ToSelectListElement,
 	#superclass : #ToListElement,
-	#instVars : [
-		'groupSelectionModel'
-	],
 	#category : #'Toplo-Widget-Select-Core'
 }
 
+{ #category : #accessing }
+ToSelectListElement >> groupSelecter [
+
+	^ self additionalSelecterWithId: #group
+]
+
 { #category : #accessing }
 ToSelectListElement >> groupSelectionModel [
 
-	^ groupSelectionModel
+	^ self groupSelecter selectionModel
 ]
 
 { #category : #initialization }
 ToSelectListElement >> initialize [
 
 	super initialize.
-	groupSelectionModel := self newSelectionModel 
+	self withUnselectableSelecter.
+	self withHiddenSelecter.
+	self withDisabledSelecter.
+	self
+		withAdditionalSelecterWithId: #group
+		withEventClass: ToSelectGroupSelectionChangedEvent
 ]
 
 { #category : #skin }
diff --git a/src/Toplo-Widget-Select/ToSelectListElementEventHandler.class.st b/src/Toplo-Widget-Select/ToSelectListElementEventHandler.class.st
index 2cff5235..9d278a6a 100644
--- a/src/Toplo-Widget-Select/ToSelectListElementEventHandler.class.st
+++ b/src/Toplo-Widget-Select/ToSelectListElementEventHandler.class.st
@@ -7,31 +7,10 @@ Class {
 	#category : #'Toplo-Widget-Select-Core'
 }
 
-{ #category : #'element handlers' }
-ToSelectListElementEventHandler >> collectionFilteredEvent: anEvent [
-
-	| listElement visibleIdxes |
-	listElement := select listElement.
-	select isMultipleSelection ifFalse: [
-		listElement secondarySelectionModel deselectAll ].
-
-	select hideSelected ifFalse: [ ^ self ].
-	visibleIdxes := Array streamContents: [ :stream |
-		                listElement dataAccessor withIndexDo: [ :d :localIndex |
-			                (listElement selectionModel containsIndex:
-				                 localIndex)
-				                ifTrue: [
-				                listElement selectionModel hideIndex: localIndex ]
-				                ifFalse: [ stream nextPut: localIndex ] ] ].
-	listElement selectionModel unhideIndexes: visibleIdxes
-]
-
 { #category : #'api - accessing' }
 ToSelectListElementEventHandler >> eventsToHandle [
 
-	^ {
-		  ToSieveSelectionChangedEvent.
-		  ToCollectionFilteredEvent }
+	^ { ToSieveSelectionChangedEvent }
 ]
 
 { #category : #accessing }
@@ -47,12 +26,15 @@ ToSelectListElementEventHandler >> sieveSelectionChangedEvent: anEvent [
 	listElement := anEvent currentTarget.
 	anEvent currentTarget dataSource notifyChanged.
 	select hideSelected ifTrue: [
-		listElement selectionModel unhideAll.
 		listElement dataAccessor withIndexDo: [ :d :localIndex |
 			| originalIndex |
 			originalIndex := select sieve dataPositionIndex at: d.
-			(listElement selectionModel containsIndex: localIndex) ifTrue: [
-				listElement selectionModel hideIndex: localIndex.
-				select selectionModel hideIndex: originalIndex ] ] ].
+			(listElement selectionModel containsIndex: localIndex)
+				ifTrue: [ listElement selectionModel hideIndex: localIndex ]
+				ifFalse: [ listElement selectionModel unhideIndex: localIndex ].
+			select selectionModel
+				transferIndex: localIndex
+				from: listElement selectionModel
+				as: originalIndex ] ].
 	select notifySelectionChanged
 ]
diff --git a/src/Toplo-Widget-Select/ToSelectListNodeHolder.class.st b/src/Toplo-Widget-Select/ToSelectListNodeHolder.class.st
index 0ac21ab4..15e0815c 100644
--- a/src/Toplo-Widget-Select/ToSelectListNodeHolder.class.st
+++ b/src/Toplo-Widget-Select/ToSelectListNodeHolder.class.st
@@ -7,37 +7,10 @@ Class {
 	#category : #'Toplo-Widget-Select-Node'
 }
 
-{ #category : #testing }
-ToSelectListNodeHolder >> isDisabled [
-
-	^ self listElement
-		  ifNil: [ true ]
-		  ifNotNil: [ :le |
-		  le disabledSelectionModel containsIndex: self originalPosition ]
-]
-
 { #category : #testing }
 ToSelectListNodeHolder >> isGroup [
 
-	^ self listElement groupSelectionModel containsIndex:
-		  self originalPosition
-]
-
-{ #category : #testing }
-ToSelectListNodeHolder >> isUnselectable [
-
-	^ self listElement
-		  ifNil: [ true ]
-		  ifNotNil: [ :le |
-		  le unselectableSelectionModel containsIndex: self originalPosition ]
-]
-
-{ #category : #testing }
-ToSelectListNodeHolder >> originalPosition [
-
-	| sieve |
-	sieve := select sieve.
-	^ sieve dataPositionIndex at: self dataItem
+	^ self listElement groupSelectionModel containsIndex: self position
 ]
 
 { #category : #accessing }
diff --git a/src/Toplo-Widget-Select/ToSelectListWindowManager.class.st b/src/Toplo-Widget-Select/ToSelectListWindowManager.class.st
index d862654e..d6b76de6 100644
--- a/src/Toplo-Widget-Select/ToSelectListWindowManager.class.st
+++ b/src/Toplo-Widget-Select/ToSelectListWindowManager.class.st
@@ -189,6 +189,7 @@ ToSelectListWindowManager >> onInstalledIn: anElement [
 
 	sieve := ToListElementSieve new.
 	sieve onInstalledIn: listElement.
+
 	listElement nodeHolderFactory: [
 		ToSelectListNodeHolder new
 			select: self;
diff --git a/src/Toplo-Widget-Select/ToSingleSelectStrategy.class.st b/src/Toplo-Widget-Select/ToSingleSelectStrategy.class.st
index b3c3edbd..43a7e401 100644
--- a/src/Toplo-Widget-Select/ToSingleSelectStrategy.class.st
+++ b/src/Toplo-Widget-Select/ToSingleSelectStrategy.class.st
@@ -14,7 +14,7 @@ ToSingleSelectStrategy >> headerNodeContainerClass [
 ToSingleSelectStrategy >> onInstalledIn: aSelect [
 
 	aSelect listElement selectionMode:
-		(ToListSingleSelectionMode new operator:
-			 (ToPrimarySelectionModelOperator new selectionModel: aSelect listElement selectionModel)).
+		(ToListSelectionMode primaryOn: aSelect listElement)
+			beSingleSelection.
 	super onInstalledIn: aSelect
 ]
diff --git a/src/Toplo/ToSkinStateGenerator.class.st b/src/Toplo/ToSkinStateGenerator.class.st
index 4eb8a47d..2ad8678b 100644
--- a/src/Toplo/ToSkinStateGenerator.class.st
+++ b/src/Toplo/ToSkinStateGenerator.class.st
@@ -653,7 +653,7 @@ ToSkinStateGenerator >> target [
 { #category : #'api - event managing' }
 ToSkinStateGenerator >> wantsEvent: anEvent [
 
-	anEvent currentTarget isEnabled ifFalse: [ ^ false ].
+	target isEnabled ifFalse: [ ^ false ].
 	^ super wantsEvent: anEvent
 ]