modifying cli for new applicability