Moved fname, lname, etc into conditional