more commented changes while CMD work