Add shuffle flag to MC question