Update to a faster version, based on profiling.