Generating improved; basic perf test added