modified for full name field