working on locations v2