Make MC shuffle optional