Reshuffling based on TJ's additions