Just bringing the sample up to date with the newer code.