Since me and any countless other people in powder toy experienced immense amount of issues in my battery, well, i have made a revision of my battery!

Water+WireWorld wires are now WireWorld wires only to store more power
Changed the switch design

Check it out: https://powdertoy.co.uk/Browse/View.html?ID=2515808