Skipping samples is now a lot faster