switching to non-local