simplified the Command package