clean up - locate (new macro)