Refactor (loop) in terms of fnr; change to use decorator.