Some changes to the commands