Further work towards new command format