adding fix for dates and all