still working on a fix for date string