Added shuffle-fq and unshuffle-fq