Added initial shuffle