improved commands design