cli rewrite to test better