Updated for play/replay Stage changes