Added randomization to structure list and event order