Updated basic and substituion command