Overhaul of command system