Better location handling (September update)