Improve commander