took out life expectancy stuff, keeping it simple for now