Put debug command back in -- Matt?