Made some changes, and removed the need for a name entry.