Added richards fix for add command and spaces