Bring back the episode handling