Added correct output
Merge branch 'tbspim'