Update with date fix