Better location handling (chocolate muffin remix)