Changed the way verbosity is handled