Not needed
Improve options/messages clarity