Merged Dave's 5-a-day data entry update