Improve CLI system but still not working