Massive overhaul of command system