Seems like the best solution is keep the present rides as they are, they're popular, and no real reason for an expensive change there. Yes, change the two restaurants on comic strip blvd. And, of course, do 'something', 'anything', with the forever underutilized Toon Theater. A fairly inexpensive fix, as theme park standards go.