Improve location