Update to include dates & fix issue with format