Improvements to Location