Improve Bathtub and mortality shape