Modified cli, updated Wrench