Added basic randomization