Re-arrange cmd