Changed command line auto generation again