add date_validation & made some changes