Within class variation added to simulator