this locator is a bit yuk and potentially fragile, is there any other options here?