Exercise 6-1 now supports underscores