Updated to run on cluster