WIP shuffle & tweak