now picks up names properly