Minor change:
- setting the dates on the right fields