modified to use first and last names