tried stuff with dead/alive
Merge branch 'dina'