Add shuffle mechanism