renamed marchitto and barron to match proxyLocationscomma