update for tweaks to how commands are invoked