better CLI #26