Take advantage of the new selection mechanism