Today
merge from pivot_or_die