Reworking commands a bit