Changed to command line tool