Some changes to Proximity