re-factor manage locations