Minimal changes to use (resolve merge conflict)
Add verbosity option