Rework shuffle mechanism half complete