modifying cli for new applicability
(cherry picked from commit 314a865d4a2c40e7b2b95b7937f6c02dc5411c3b)