Changes for running on cluster