Changed 7r&7v app to location-ref method