buoyancy now staggered & new heatSrc setter
buoyancy now staggered & new heatSrc setter
merge conflict