Lots of changes. Main is 50% speed increase for sampling.