More shuffling and adds logging