renamed dinner --> diner