- added a Date checker as well