Reshuffle to try and help with the resque issue...