Changes to Iterator and Player