Modified zipWithIndex