Forgot to allow underscores as an option