more moving around (#564)
More shuffling (#564)