a shuffle, a little smarter now