changing dates to be more fluid