Dinner details
Fixed merge