One of the often edited out sequences of TPM is the Bongo ride.

In it's current form it's just a showcase for now outdated special effects but I was thinking today about how it could be salvaged.

What if the droid army have an underwater variants of the STAP (STSP I guess) and the Bongo gets attacked by essentially robot frogmen in the James Bond mode. Jar-Jar could call the metal fish.

This would foreshadow the Gungans having to evacuate their home.

If they were taken out by one of the giant sea-creatures Gui-Gon's line about the the 'bigger fish' would be a reference to the living Force overcoming mechanical Force which has been a theme of Star Wars since Luke switched off his targeting computer and reaches it's zenith in the cyborg Vader being conquered by Anakin from within.

Besides I always liked those Scuba fights in Bond movies when I was a kid.

Maybe the droids piloting them could be made to look a bit more like men in wetsuits (painted black with flippers etc).