I think Shrek is going in December alas T2 as they still need extra space just like what T2 happened. it went after the year and if it doesn't happen like that, right after Grinchmas. With that in mind, they probably will have to say something of Shrek but i don't think its leaving that soon. In waterworld, I think they are going to hold that for after Potter opens as that is the pure people eater but what comes after that is diffrent. If it was me; i'd actauly would really like that rumored Potter Show that was rumored to be in Phase II in orlando so it doesn't get fully wasted.