Changed TODO.
Added when clause for more dates.