fixed death and merged w/ main branch