Improve performance in moving charge
Avoid oom during moving charge