Honestly the final dungeon of each expansion pre-patch should be moved to the main scenario roulette. There's no reason for that thing to only have 3 things in there. Or at least ARF with its lengthy scenes at the final room.