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