Slight update to command system