massive changes in cli module