Improve date/time decision