working on locations v7