My tank neck was sticking through the firewall installed as it was designed to be. Now that you mention it I could just install the new tank there on the battery tray not rubbing any ribs and move the battery back behind the servos but I don't think at that location there is enough depth in the fuse and when you connect the wing you are going to hit the top of the tank. Let me mess around with it and see. It did seem a little nose heavy for what little I was able to fly it so moving things back should not hurt