Command overhaul