Updates to birth and death tools