they should make an aftermarket mavica battery that isn't a complete nightmare to take out