+ cmd improvement