change to new command format