Undoing change to Math.random() for now, this creates a weird bug