Added key check to uniformity analysis
Merge
Undid accidental commit
Merge