Date Validation Logic Updated again