A little bit of work for the commands