Make commend more useful