Made changes after testing cyclePlayer