Reruns/branch lms

Nit: it's odd to have `_loc` and `_location`.