More work on training CLI