better hpc support