Add randomization; need to do structured randomization