improved CLI