integrated with new command style