i would also remove the failsafe and add a spring at the engine(throttle return spring).the other is relocate the battery tray to ontop of the reciever, it will pay for itself once done when you run into water.have fun