Revert "Revert "add location""

This reverts commit 96dc39bed9b281e46bda0fdb7138e251c7a24091.