Some speedups for an NREL model