Change in command line interface to split working flow.