Looks better thanks. I wonder if `nonEmpty` would work instead of `!….isEmpty`.