Change samples to use wrapping with block