Changed generator to use enumerate(start=1)