CMD improvements by TN
CMD improvements by TN