more modular location getting, now works for other countries