Worked on first name problem