Added shuffle method