generateDates() etc added