Today
Merge from kill_countdown_fix