updated for running on the cluster more quickly