adding proper name fields back in