Now can be invoked from command line