Mainly work on the cli script.