Added logic for saving spoilers