updated with corrections from salmonella