#18 Sort out updated dates