Alterations to CLI