OK, now fixing the length of the new commands, too