added code to shuffle mock