Improved location feature