Review: refactored nonlocal