Improved randomisation