Improve material, working on location search