Tweak of previous commit
Selection tweak
No save button