Changed command system to allow for abbreviations