Still fixing imbalance bug