Reshuffler completed, and comment implementation