Reintroduce pre-distribution step, to make sure threads dont drop out too early, but this time do it right