New command and a few changes