- Better date checking
