refactored to use unique ids not firstname and last name