Adjusted CMD functionality