This coming September will be my third time coming to Disney World using a scooter and there has been several changes. I remember going to the side of Thunder Mountain and through the gift shop to get on Tower of Terror. Is that still the same? Would FP still be needed on those two rides?