@dantleech you worked on those commands quite a bit. do you agree with
this change as well?