Better version for HPC