Removed check_validity
Removed dist
Names