Trying to fix new command system