Today
merge from fix_vitals_sorting