Improve performance in moving swap charge2