changed how name value pairs should be produced