refactoring to use dates, not strings
refactorign and ignoring old dependency