Some more work on shuffle