Updated for latest changes to lifetimes