Added temporary Command setup lines