resync 2.5. Better consistency and sum controls