Another strong code change. This one focusses Set management: