Better balance (18/31)

Better balance