Modified for validity on the cluster