some Re-balancing changes