Improve rebalancing