Changes to proximity loop