Fix insane compute times. Dodgy merge.