new output
Merge branch 'kamikaze'