NF/RF/BF: Major and needed timing refactorization.