Cut runtime to about 1/3 of previous.