More shuffling because I have problems