Updated to the new command system