Reshuffle and variables update