Still trying to fix timing after refactor.