Incorporated SLURM changes