More optimization
More optimization, cli files.